Skip to content

Commit fda1379

Browse files
Vladimir Rusnakwaiet
authored andcommitted
Fix Key Vault JCA CI formatting
1 parent dd71a13 commit fda1379

2 files changed

Lines changed: 24 additions & 20 deletions

File tree

  • sdk/keyvault/azure-security-keyvault-jca

sdk/keyvault/azure-security-keyvault-jca/README.md

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -545,20 +545,22 @@ az role assignment create \
545545
```
546546

547547
If you run `jarsigner` behind a proxy, pass the standard JVM proxy system properties with `-J`:
548-
```bash
549-
jarsigner -keystore NONE -storetype AzureKeyVault \
550-
-signedjar signerjar.jar ${PARAM_YOUR_JAR_FILE_PATH} "${CERT_NAME}" \
551-
-verbose -storepass "" \
552-
-providerName AzureKeyVault \
553-
-providerClass com.azure.security.keyvault.jca.KeyVaultJcaProvider \
554-
-J-Dazure.keyvault.uri=${KEYVAULT_URL} \
555-
-J-Dazure.keyvault.tenant-id=${TENANT} \
556-
-J-Dazure.keyvault.client-id=${CLIENT_ID} \
557-
-J-Dazure.keyvault.client-secret=${CLIENT_SECRET} \
558-
-J-Dhttps.proxyHost=proxy.company.local \
559-
-J-Dhttps.proxyPort=8080 \
560-
'-J-Dhttp.nonProxyHosts=169.254.169.254|localhost|127.*'
561-
```
548+
549+
```bash
550+
jarsigner -keystore NONE -storetype AzureKeyVault \
551+
-signedjar signerjar.jar ${PARAM_YOUR_JAR_FILE_PATH} "${CERT_NAME}" \
552+
-verbose -storepass "" \
553+
-providerName AzureKeyVault \
554+
-providerClass com.azure.security.keyvault.jca.KeyVaultJcaProvider \
555+
-J-Dazure.keyvault.uri=${KEYVAULT_URL} \
556+
-J-Dazure.keyvault.tenant-id=${TENANT} \
557+
-J-Dazure.keyvault.client-id=${CLIENT_ID} \
558+
-J-Dazure.keyvault.client-secret=${CLIENT_SECRET} \
559+
-J-Dhttps.proxyHost=proxy.company.local \
560+
-J-Dhttps.proxyPort=8080 \
561+
'-J-Dhttp.nonProxyHosts=169.254.169.254|localhost|127.*'
562+
```
563+
562564
`http.nonProxyHosts` may be needed for local or managed identity endpoints, such as `169.254.169.254`,
563565
that should bypass the proxy.
564566

sdk/keyvault/azure-security-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/implementation/utils/HttpUtilTest.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,19 +85,21 @@ public void testHttpUtilGet1() {
8585
private static void handleProxyRequest(ServerSocket proxyServer, AtomicReference<String> requestLine,
8686
CountDownLatch requestReceived, AtomicReference<Exception> proxyFailure) {
8787
try (Socket socket = proxyServer.accept();
88-
BufferedReader reader = new BufferedReader(
89-
new InputStreamReader(socket.getInputStream(), StandardCharsets.UTF_8));
88+
BufferedReader reader
89+
= new BufferedReader(new InputStreamReader(socket.getInputStream(), StandardCharsets.UTF_8));
9090
OutputStream outputStream = socket.getOutputStream()) {
9191

9292
requestLine.set(reader.readLine());
9393
String line;
94-
while ((line = reader.readLine()) != null && !line.isEmpty()) {
95-
// Consume request headers before writing the response.
94+
while ((line = reader.readLine()) != null) {
95+
if (line.isEmpty()) {
96+
break;
97+
}
9698
}
9799

98100
byte[] body = "proxied".getBytes(StandardCharsets.UTF_8);
99-
outputStream.write(("HTTP/1.1 200 OK\r\nContent-Length: " + body.length + "\r\n\r\n")
100-
.getBytes(StandardCharsets.UTF_8));
101+
outputStream.write(
102+
("HTTP/1.1 200 OK\r\nContent-Length: " + body.length + "\r\n\r\n").getBytes(StandardCharsets.UTF_8));
101103
outputStream.write(body);
102104
outputStream.flush();
103105
requestReceived.countDown();

0 commit comments

Comments
 (0)