Skip to content

Metadata server address modification to account for default port #12468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 12, 2025
Merged

Metadata server address modification to account for default port #12468

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db4206e
ensuring case where user only passes in host uses the correct port
srkethireddy Nov 3, 2025
d9a6414
styling
srkethireddy Nov 4, 2025
77d99c6
removing unecessary variable
srkethireddy Nov 5, 2025
853df74
when port is specified, change to use port 8080
srkethireddy Nov 5, 2025
d978c6a
adding comments
srkethireddy Nov 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions alts/src/main/java/io/grpc/alts/HandshakerServiceChannel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package io.grpc.alts;

import com.google.common.base.MoreObjects;
import io.grpc.CallOptions;
import io.grpc.Channel;
import io.grpc.ClientCall;
Expand All @@ -38,13 +37,25 @@
* application will have at most one connection to the handshaker service.
*/
final class HandshakerServiceChannel {

private static final int ALTS_PORT = 8080;
private static final String DEFAULT_TARGET = "metadata.google.internal.:8080";

static final Resource<Channel> SHARED_HANDSHAKER_CHANNEL =
new ChannelResource(
MoreObjects.firstNonNull(
System.getenv("GCE_METADATA_HOST"), "metadata.google.internal.:8080"));


new ChannelResource(getHandshakerTarget(System.getenv("GCE_METADATA_HOST")));

static String getHandshakerTarget(String envValue) {
if (envValue == null || envValue.isEmpty()) {
return DEFAULT_TARGET;
}
String host = envValue;
int portIndex = host.lastIndexOf(':');
if (portIndex != -1) {
host = host.substring(0, portIndex);
}
return host + ":" + ALTS_PORT;
}

/** Returns a resource of handshaker service channel for testing only. */
static Resource<Channel> getHandshakerChannelForTesting(String handshakerAddress) {
return new ChannelResource(handshakerAddress);
Expand Down
18 changes: 18 additions & 0 deletions alts/src/test/java/io/grpc/alts/HandshakerServiceChannelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,24 @@ public void sharedChannel_authority() {
}
}

@Test
public void getHandshakerTarget_nullEnvVar() {
assertThat(HandshakerServiceChannel.getHandshakerTarget(null))
.isEqualTo("metadata.google.internal.:8080");
}

@Test
public void getHandshakerTarget_envVarWithPort() {
assertThat(HandshakerServiceChannel.getHandshakerTarget("169.254.169.254:80"))
.isEqualTo("169.254.169.254:8080");
}

@Test
public void getHandshakerTarget_envVarWithHostOnly() {
assertThat(HandshakerServiceChannel.getHandshakerTarget("169.254.169.254"))
.isEqualTo("169.254.169.254:8080");
}

@Test
public void resource_works() {
Channel channel = resource.create();
Expand Down