Jul 28, 2025 · Jul 28, 2025 · Jul 29, 2025 · Jul 29, 2025 · Jul 29, 2025 · Jul 31, 2025
diff --git a/.../main/java/software/amazon/awssdk/imds/internal/DefaultEc2MetadataClientWithFallback.java b/.../main/java/software/amazon/awssdk/imds/internal/DefaultEc2MetadataClientWithFallback.java

        this.imdsV1FallbackEnabled = !resolveImdsV1Disabled();

        this.tokenCache = CachedSupplier.builder(() -> RefreshResult.builder(this.getToken())
        this.tokenCache = CachedSupplier.builder(() -> RefreshResult.builder(this.getTokenWithFallback())
                                                                    .staleTime(Instant.now().plus(tokenTtl))
                                                                    .build())
                                        .cachedValueName(toString())
            RetryPolicyContext retryPolicyContext = RetryPolicyContext.builder().retriesAttempted(attempt).build();
            try {
                if (token == null || token.isExpired()) {
                    token =getTokenWithFallback();
                    token =tokenCache.get();
                }
                return sendRequest(path, token != null ? token.value() : null);
            } catch (UncheckedIOException | RetryableException e) {
    }

    /**
     * Gets token with fallback logic thatmatches EC2MetadataUtils behavior.
     * Gets token with fallback logic thatcan be cached.
     * If token retrieval fails with 400 error, throws exception.
     * Otherwise, returns null to indicate fallback to IMDSv1.
     */
    private Token getTokenWithFallback() {
        try {
            returntokenCache.get();
            returngetToken();
        } catch (Exception e) {
            boolean is400ServiceException = e instanceof Ec2MetadataClientException
                    && ((Ec2MetadataClientException) e).statusCode() == 400;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -80,7 +80,7 @@ private DefaultEc2MetadataClientWithFallback(Ec2MetadataBuilder builder) {

		this.imdsV1FallbackEnabled = !resolveImdsV1Disabled();

		this.tokenCache = CachedSupplier.builder(() -> RefreshResult.builder(this.getToken())
		this.tokenCache = CachedSupplier.builder(() -> RefreshResult.builder(this.getTokenWithFallback())
		.staleTime(Instant.now().plus(tokenTtl))
		.build())
		.cachedValueName(toString())
Expand DownExpand Up		@@ -122,7 +122,7 @@ public Ec2MetadataResponse get(String path) {
		RetryPolicyContext retryPolicyContext = RetryPolicyContext.builder().retriesAttempted(attempt).build();
		try {
		if (token == null \|\| token.isExpired()) {
		token =getTokenWithFallback();
		token =tokenCache.get();
		}
		return sendRequest(path, token != null ? token.value() : null);
		} catch (UncheckedIOException \| RetryableException e) {
Expand DownExpand Up		@@ -154,13 +154,13 @@ public Ec2MetadataResponse get(String path) {
		}

		/**
		* Gets token with fallback logic thatmatches EC2MetadataUtils behavior.
		* Gets token with fallback logic thatcan be cached.
		* If token retrieval fails with 400 error, throws exception.
		* Otherwise, returns null to indicate fallback to IMDSv1.
		*/
		private Token getTokenWithFallback() {
		try {
		returntokenCache.get();
		returngetToken();
		} catch (Exception e) {
		boolean is400ServiceException = e instanceof Ec2MetadataClientException
		&& ((Ec2MetadataClientException) e).statusCode() == 400;
Expand Down