Skip to content

Commit bd29e94

Browse files
JacksonTianJacksonTian
committed
remove CredentialsProviderFactory.java
1 parent 8bbe1a7 commit bd29e94

File tree

4 files changed

+31
-64
lines changed

4 files changed

+31
-64
lines changed

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/CredentialsProviderFactory.java

-7
This file was deleted.

‎aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/ProfileCredentialsProvider.java

+12-21
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ public AlibabaCloudCredentials getCredentials() throws ClientException {
4545
if (clientConfig == null) {
4646
throw new ClientException("Client is not open in the specified credentials file");
4747
}
48-
CredentialsProviderFactory credentialsProviderFactory = new CredentialsProviderFactory();
49-
return createCredential(clientConfig, credentialsProviderFactory);
48+
return createCredential(clientConfig);
5049
}
5150

5251
private Map<String, Map<String, String>> loadIni(Wini ini) {
@@ -65,20 +64,19 @@ private Map<String, Map<String, String>> loadIni(Wini ini) {
6564
return client;
6665
}
6766

68-
private AlibabaCloudCredentials createCredential(Map<String, String> clientConfig,
69-
CredentialsProviderFactory factory) throws ClientException {
67+
private AlibabaCloudCredentials createCredential(Map<String, String> clientConfig) throws ClientException {
7068
String configType = clientConfig.get(AuthConstant.INI_TYPE);
7169
if (StringUtils.isEmpty(configType)) {
7270
throw new ClientException("The configured client type is empty");
7371
}
7472
if (AuthConstant.INI_TYPE_ARN.equals(configType)) {
75-
return getSTSAssumeRoleSessionCredentials(clientConfig, factory);
73+
return getSTSAssumeRoleSessionCredentials(clientConfig);
7674
}
7775
if (AuthConstant.INI_TYPE_KEY_PAIR.equals(configType)) {
78-
return getSTSGetSessionAccessKeyCredentials(clientConfig, factory);
76+
return getSTSGetSessionAccessKeyCredentials(clientConfig);
7977
}
8078
if (AuthConstant.INI_TYPE_RAM.equals(configType)) {
81-
return getInstanceProfileCredentials(clientConfig, factory);
79+
return getInstanceProfileCredentials(clientConfig);
8280
}
8381
String accessKeyId = clientConfig.get(AuthConstant.INI_ACCESS_KEY_ID);
8482
String accessKeySecret = clientConfig.get(AuthConstant.INI_ACCESS_KEY_IDSECRET);
@@ -88,8 +86,7 @@ private AlibabaCloudCredentials createCredential(Map<String, String> clientConfi
8886
return new BasicCredentials(accessKeyId, accessKeySecret);
8987
}
9088

91-
private AlibabaCloudCredentials getSTSAssumeRoleSessionCredentials(Map<String, String> clientConfig,
92-
CredentialsProviderFactory factory)
89+
private AlibabaCloudCredentials getSTSAssumeRoleSessionCredentials(Map<String, String> clientConfig)
9390
throws ClientException {
9491
String accessKeyId = clientConfig.get(AuthConstant.INI_ACCESS_KEY_ID);
9592
String accessKeySecret = clientConfig.get(AuthConstant.INI_ACCESS_KEY_IDSECRET);
@@ -103,14 +100,12 @@ private AlibabaCloudCredentials getSTSAssumeRoleSessionCredentials(Map<String, S
103100
if (StringUtils.isEmpty(roleSessionName) || StringUtils.isEmpty(roleArn)) {
104101
throw new ClientException("The configured role_session_name or role_arn is empty");
105102
}
106-
STSAssumeRoleSessionCredentialsProvider provider =
107-
factory.createCredentialsProvider(new STSAssumeRoleSessionCredentialsProvider(accessKeyId,
108-
accessKeySecret, roleSessionName, roleArn, regionId, policy));
103+
STSAssumeRoleSessionCredentialsProvider provider = new STSAssumeRoleSessionCredentialsProvider(accessKeyId,
104+
accessKeySecret, roleSessionName, roleArn, regionId, policy);
109105
return provider.getCredentials();
110106
}
111107

112-
private AlibabaCloudCredentials getSTSGetSessionAccessKeyCredentials(Map<String, String> clientConfig,
113-
CredentialsProviderFactory factory)
108+
private AlibabaCloudCredentials getSTSGetSessionAccessKeyCredentials(Map<String, String> clientConfig)
114109
throws ClientException {
115110
String publicKeyId = clientConfig.get(AuthConstant.INI_PUBLIC_KEY_ID);
116111
String privateKeyFile = clientConfig.get(AuthConstant.INI_PRIVATE_KEY_FILE);
@@ -121,20 +116,16 @@ private AlibabaCloudCredentials getSTSGetSessionAccessKeyCredentials(Map<String,
121116
if (StringUtils.isEmpty(publicKeyId) || StringUtils.isEmpty(privateKey)) {
122117
throw new ClientException("The configured public_key_id or private_key_file content is empty");
123118
}
124-
STSGetSessionAccessKeyCredentialsProvider provider =
125-
factory.createCredentialsProvider(new STSGetSessionAccessKeyCredentialsProvider(publicKeyId, privateKey));
119+
STSGetSessionAccessKeyCredentialsProvider provider = new STSGetSessionAccessKeyCredentialsProvider(publicKeyId, privateKey);
126120
return provider.getCredentials();
127121
}
128122

129-
private AlibabaCloudCredentials getInstanceProfileCredentials(Map<String, String> clientConfig,
130-
CredentialsProviderFactory factory)
131-
throws ClientException {
123+
private AlibabaCloudCredentials getInstanceProfileCredentials(Map<String, String> clientConfig) throws ClientException {
132124
String roleName = clientConfig.get(AuthConstant.INI_ROLE_NAME);
133125
if (StringUtils.isEmpty(roleName)) {
134126
throw new ClientException("The configured role_name is empty");
135127
}
136-
InstanceProfileCredentialsProvider provider =
137-
factory.createCredentialsProvider(new InstanceProfileCredentialsProvider(roleName));
128+
InstanceProfileCredentialsProvider provider = new InstanceProfileCredentialsProvider(roleName);
138129
return provider.getCredentials();
139130
}
140131

‎aliyun-java-sdk-core/src/test/java/com/aliyuncs/auth/CredentialsProviderFactoryTest.java

-13
This file was deleted.

‎aliyun-java-sdk-core/src/test/java/com/aliyuncs/auth/ProfileCredentialsProviderTest.java

+19-23
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,11 @@ public void createCredentialTest() throws NoSuchMethodException, InvocationTarge
4747
ProfileCredentialsProvider provider = new ProfileCredentialsProvider();
4848
Class providerClass = provider.getClass();
4949
Method createCredential = providerClass.getDeclaredMethod(
50-
"createCredential", Map.class, CredentialsProviderFactory.class);
50+
"createCredential", Map.class);
5151
createCredential.setAccessible(true);
52-
CredentialsProviderFactory factory = new CredentialsProviderFactory();
5352
Map<String, String> client = new HashMap<String, String>();
5453
try {
55-
createCredential.invoke(provider, client, factory);
54+
createCredential.invoke(provider, client);
5655
Assert.fail();
5756
} catch (Exception e) {
5857
Assert.assertEquals("The configured client type is empty", e.getCause().getLocalizedMessage());
@@ -61,7 +60,7 @@ public void createCredentialTest() throws NoSuchMethodException, InvocationTarge
6160

6261
client.put(AuthConstant.INI_TYPE, AuthConstant.INI_TYPE_RAM);
6362
try {
64-
createCredential.invoke(provider, client, factory);
63+
createCredential.invoke(provider, client);
6564
Assert.fail();
6665
} catch (Exception e) {
6766
Assert.assertEquals("The configured role_name is empty",
@@ -71,21 +70,20 @@ public void createCredentialTest() throws NoSuchMethodException, InvocationTarge
7170
client.clear();
7271
client.put(AuthConstant.INI_ACCESS_KEY_ID, AuthConstant.INI_TYPE_RAM);
7372
client.put(AuthConstant.INI_TYPE, "access_key");
74-
Assert.assertNull(createCredential.invoke(provider, client, factory));
73+
Assert.assertNull(createCredential.invoke(provider, client));
7574
}
7675

7776
@Test
7877
public void getSTSAssumeRoleSessionCredentialsTest() throws NoSuchMethodException {
7978
ProfileCredentialsProvider provider = new ProfileCredentialsProvider();
8079
Class providerClass = provider.getClass();
8180
Method createCredential = providerClass.getDeclaredMethod(
82-
"createCredential", Map.class, CredentialsProviderFactory.class);
81+
"createCredential", Map.class);
8382
createCredential.setAccessible(true);
84-
CredentialsProviderFactory factory = new CredentialsProviderFactory();
8583
Map<String, String> client = new HashMap<String, String>();
8684
client.put(AuthConstant.INI_TYPE, AuthConstant.INI_TYPE_ARN);
8785
try {
88-
createCredential.invoke(provider, client, factory);
86+
createCredential.invoke(provider, client);
8987
Assert.fail();
9088
} catch (Exception e) {
9189
Assert.assertEquals("The configured access_key_id or access_key_secret is empty",
@@ -94,23 +92,23 @@ public void getSTSAssumeRoleSessionCredentialsTest() throws NoSuchMethodExceptio
9492

9593
try {
9694
client.put(AuthConstant.INI_ACCESS_KEY_ID, AuthConstant.INI_TYPE_ARN);
97-
createCredential.invoke(provider, client, factory);
95+
createCredential.invoke(provider, client);
9896
Assert.fail();
9997
} catch (Exception e) {
10098
Assert.assertEquals("The configured access_key_id or access_key_secret is empty",
10199
e.getCause().getLocalizedMessage());
102100
}
103101
try {
104102
client.put(AuthConstant.INI_ACCESS_KEY_IDSECRET, AuthConstant.INI_TYPE_ARN);
105-
createCredential.invoke(provider, client, factory);
103+
createCredential.invoke(provider, client);
106104
Assert.fail();
107105
} catch (Exception e) {
108106
Assert.assertEquals("The configured role_session_name or role_arn is empty",
109107
e.getCause().getLocalizedMessage());
110108
}
111109
try {
112110
client.put(AuthConstant.INI_ROLE_SESSION_NAME, AuthConstant.INI_TYPE_ARN);
113-
createCredential.invoke(provider, client, factory);
111+
createCredential.invoke(provider, client);
114112
} catch (Exception e) {
115113
Assert.assertEquals("The configured role_session_name or role_arn is empty",
116114
e.getCause().getLocalizedMessage());
@@ -122,13 +120,12 @@ public void getSTSGetSessionAccessKeyCredentialsTest() throws NoSuchMethodExcep
122120
ProfileCredentialsProvider provider = new ProfileCredentialsProvider();
123121
Class providerClass = provider.getClass();
124122
Method createCredential = providerClass.getDeclaredMethod(
125-
"createCredential", Map.class, CredentialsProviderFactory.class);
123+
"createCredential", Map.class);
126124
createCredential.setAccessible(true);
127-
CredentialsProviderFactory factory = new CredentialsProviderFactory();
128125
Map<String, String> client = new HashMap<String, String>();
129126
client.put(AuthConstant.INI_TYPE, AuthConstant.INI_TYPE_KEY_PAIR);
130127
try {
131-
createCredential.invoke(provider, client, factory);
128+
createCredential.invoke(provider, client);
132129
Assert.fail();
133130
} catch (Exception e) {
134131
Assert.assertEquals("The configured private_key_file is empty",
@@ -137,7 +134,7 @@ public void getSTSGetSessionAccessKeyCredentialsTest() throws NoSuchMethodExcep
137134
client.put(AuthConstant.INI_PRIVATE_KEY_FILE, "sads");
138135
AuthUtils.setPrivateKey("test");
139136
try {
140-
createCredential.invoke(provider, client, factory);
137+
createCredential.invoke(provider, client);
141138
Assert.fail();
142139
} catch (Exception e) {
143140
Assert.assertEquals("The configured public_key_id or private_key_file content is empty",
@@ -153,7 +150,7 @@ public void createCredentialsProviderTest() throws
153150
ProfileCredentialsProvider profileCredentialsProvider = new ProfileCredentialsProvider();
154151
Class providerClass = profileCredentialsProvider.getClass();
155152
Method createCredential = providerClass.getDeclaredMethod(
156-
"createCredential", Map.class, CredentialsProviderFactory.class);
153+
"createCredential", Map.class);
157154
createCredential.setAccessible(true);
158155
Map<String, String> client = new HashMap<String, String>();
159156
client.put(AuthConstant.INI_TYPE, AuthConstant.INI_TYPE_ARN);
@@ -165,10 +162,9 @@ public void createCredentialsProviderTest() throws
165162
STSAssumeRoleSessionCredentialsProvider stsAssumeRoleSessionCredentialsProvider =
166163
Mockito.mock(STSAssumeRoleSessionCredentialsProvider.class);
167164
Mockito.when(stsAssumeRoleSessionCredentialsProvider.getCredentials()).thenReturn(null);
168-
CredentialsProviderFactory factory = Mockito.mock(CredentialsProviderFactory.class);
169-
Mockito.when(factory.createCredentialsProvider(Mockito.any(STSAssumeRoleSessionCredentialsProvider.class))).
165+
Mockito.when(Mockito.any(STSAssumeRoleSessionCredentialsProvider.class)).
170166
thenReturn(stsAssumeRoleSessionCredentialsProvider);
171-
Assert.assertNull(createCredential.invoke(profileCredentialsProvider, client, factory));
167+
Assert.assertNull(createCredential.invoke(profileCredentialsProvider, client));
172168

173169
client.clear();
174170
client.put(AuthConstant.INI_TYPE, AuthConstant.INI_TYPE_KEY_PAIR);
@@ -179,9 +175,9 @@ public void createCredentialsProviderTest() throws
179175
STSGetSessionAccessKeyCredentialsProvider stsGetSessionAccessKeyCredentialsProvider =
180176
Mockito.mock(STSGetSessionAccessKeyCredentialsProvider.class);
181177
Mockito.when(stsGetSessionAccessKeyCredentialsProvider.getCredentials()).thenReturn(null);
182-
Mockito.when(factory.createCredentialsProvider(Mockito.any(STSGetSessionAccessKeyCredentialsProvider.class))).
178+
Mockito.when(Mockito.any(STSGetSessionAccessKeyCredentialsProvider.class)).
183179
thenReturn(stsGetSessionAccessKeyCredentialsProvider);
184-
Assert.assertNull(createCredential.invoke(profileCredentialsProvider, client, factory));
180+
Assert.assertNull(createCredential.invoke(profileCredentialsProvider, client));
185181
AuthUtils.setPrivateKey(null);
186182

187183
client.clear();
@@ -190,9 +186,9 @@ public void createCredentialsProviderTest() throws
190186
InstanceProfileCredentialsProvider instanceProfileCredentialsProvider =
191187
Mockito.mock(InstanceProfileCredentialsProvider.class);
192188
Mockito.when(instanceProfileCredentialsProvider.getCredentials()).thenReturn(null);
193-
Mockito.when(factory.createCredentialsProvider(Mockito.any(InstanceProfileCredentialsProvider.class))).
189+
Mockito.when(Mockito.any(InstanceProfileCredentialsProvider.class)).
194190
thenReturn(instanceProfileCredentialsProvider);
195-
Assert.assertNull(createCredential.invoke(profileCredentialsProvider, client, factory));
191+
Assert.assertNull(createCredential.invoke(profileCredentialsProvider, client));
196192
}
197193

198194
@Test

0 commit comments

Comments
 (0)