This repository has been archived by the owner on Mar 21, 2022. It is now read-only.
add RegistryAuthSupplier interface #759
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| /*- | ||
| * -\-\- | ||
| * docker-client | ||
| * -- | ||
| * Copyright (C) 2016 Spotify AB | ||
| * -- | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * -/-/- | ||
| */ | ||
|
|
||
| package com.spotify.docker.client; | ||
|
|
||
| import static com.google.common.base.Preconditions.checkNotNull; | ||
| import static com.google.common.base.Strings.isNullOrEmpty; | ||
|
|
||
| import com.fasterxml.jackson.databind.JsonNode; | ||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import com.fasterxml.jackson.databind.node.ObjectNode; | ||
| import com.google.common.base.Preconditions; | ||
| import com.spotify.docker.client.messages.RegistryAuth; | ||
| import com.spotify.docker.client.messages.RegistryConfigs; | ||
| import java.io.IOException; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.nio.file.Paths; | ||
| import java.util.Map; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| public class DockerConfigReader { | ||
| private static final Logger LOG = LoggerFactory.getLogger(DockerConfigReader.class); | ||
|
|
||
| private static final ObjectMapper MAPPER = ObjectMapperProvider.objectMapper(); | ||
|
|
||
| /** Returns all RegistryConfig instances from the configuration file. */ | ||
| public RegistryConfigs fromConfig(Path configPath) throws IOException { | ||
|
There was a problem hiding this comment. Why not make these all static methods? Then you remove a call to the constructor at call sites. There was a problem hiding this comment. I think this was done to make it easy to mock it |
||
| return parseDockerConfig(configPath); | ||
| } | ||
|
|
||
| public RegistryAuth fromConfig(Path configPath, String serverAddress) throws IOException { | ||
| return parseDockerConfig(configPath, serverAddress); | ||
| } | ||
|
|
||
| /** | ||
| * @deprecated do not use - only exists for backwards compatibility. Use {@link #fromConfig(Path)} | ||
| * instead. | ||
| */ | ||
| @Deprecated | ||
| public RegistryAuth fromFirstConfig(Path configPath) throws IOException { | ||
| return parseDockerConfig(configPath, null); | ||
| } | ||
|
|
||
| private RegistryAuth parseDockerConfig(final Path configPath, String serverAddress) | ||
| throws IOException { | ||
| checkNotNull(configPath); | ||
|
|
||
| final Map<String, RegistryAuth> configs = parseDockerConfig(configPath).configs(); | ||
| if (serverAddress != null && configs.containsKey(serverAddress) ) { | ||
| return configs.get(serverAddress); | ||
| } | ||
|
|
||
| if (isNullOrEmpty(serverAddress)) { | ||
| if (configs.isEmpty()) { | ||
| return RegistryAuth.builder().build(); | ||
| } | ||
| LOG.warn("Returning first entry from docker config file - use fromConfig(Path) instead, " | ||
| + "this behavior is deprecated and will soon be removed"); | ||
| return configs.values().iterator().next(); | ||
| } | ||
|
|
||
| throw new IllegalArgumentException( | ||
| "serverAddress=" + serverAddress + " does not appear in config file at " + configPath); | ||
| } | ||
|
|
||
| private RegistryConfigs parseDockerConfig(final Path configPath) throws IOException { | ||
| checkNotNull(configPath); | ||
| return MAPPER.treeToValue(extractAuthJson(configPath), RegistryConfigs.class); | ||
| } | ||
|
|
||
| public Path defaultConfigPath() { | ||
| final String home = System.getProperty("user.home"); | ||
| final Path dockerConfig = Paths.get(home, ".docker", "config.json"); | ||
| final Path dockerCfg = Paths.get(home, ".dockercfg"); | ||
|
|
||
| if (Files.exists(dockerConfig)) { | ||
| LOG.debug("Using configfile: {}", dockerConfig); | ||
| return dockerConfig; | ||
| } else { | ||
| LOG.debug("Using configfile: {} ", dockerCfg); | ||
| return dockerCfg; | ||
| } | ||
| } | ||
|
|
||
| private ObjectNode extractAuthJson(final Path configPath) throws IOException { | ||
| final JsonNode config = MAPPER.readTree(configPath.toFile()); | ||
|
|
||
| Preconditions.checkState(config.isObject(), | ||
| "config file contents are not a JSON Object, instead it is a %s", config.getNodeType()); | ||
|
|
||
| if (config.has("auths")) { | ||
| final JsonNode auths = config.get("auths"); | ||
| Preconditions.checkState(auths.isObject(), | ||
| "config file contents are not a JSON Object, instead it is a %s", auths.getNodeType()); | ||
| return (ObjectNode) auths; | ||
| } | ||
|
|
||
| return (ObjectNode) config; | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this endpoint need auth at all? Docs don't mention it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not sure, but the existing code has it.