Expose Context key in profile as property and allow override in bookmark.

Author: dkocher

core/src/main/java/ch/cyberduck/core/Profile.java

@@ -685,6 +685,9 @@ public Map<String, String> getProperties() {
                 property -> StringUtils.contains(property, '=') ? substitutor.replace(StringUtils.substringAfter(property, '=')) : StringUtils.EMPTY)));
         // In profile as dict
         properties.putAll(this.map(PROPERTIES_KEY));
+        if(null != this.getContext()) {
+            properties.put(CONTEXT_KEY, this.getContext());
+        }
         return properties;
     }
 

s3/src/main/java/ch/cyberduck/core/s3/S3Session.java

@@ -27,6 +27,7 @@
 import ch.cyberduck.core.LoginCallback;
 import ch.cyberduck.core.Path;
 import ch.cyberduck.core.PathContainerService;
+import ch.cyberduck.core.Profile;
 import ch.cyberduck.core.Scheme;
 import ch.cyberduck.core.TemporaryAccessTokens;
 import ch.cyberduck.core.UrlProvider;
@@ -267,7 +268,7 @@ protected S3CredentialsStrategy configureCredentialsStrategy(final HttpClientBui
             if(Scheme.isURL(host.getProtocol().getContext())) {
                 log.debug("Auto-configure credentials from instance metadata {}", host.getProtocol().getContext());
                 // Fetch temporary session token from instance metadata
-                return new AWSSessionCredentialsRetriever(trust, key, host.getProtocol().getContext());
+                return new AWSSessionCredentialsRetriever(trust, key, preferences.getProperty(Profile.CONTEXT_KEY));
             }
         }
         if(host.getProtocol().isRoleConfigurable()) {