Rework change detection
This commit is contained in:
parent
9d39885d18
commit
988be3458d
1 changed files with 16 additions and 14 deletions
|
@ -162,13 +162,9 @@ class DockerLoginManager:
|
||||||
# Get status from registry response.
|
# Get status from registry response.
|
||||||
if self.response.has_key("Status"):
|
if self.response.has_key("Status"):
|
||||||
self.log.append(self.response["Status"])
|
self.log.append(self.response["Status"])
|
||||||
if self.response["Status"] == "Login Succeeded":
|
|
||||||
self.changed = True
|
|
||||||
else:
|
|
||||||
self.log.append("Already Authentificated")
|
|
||||||
|
|
||||||
# Update the dockercfg if changed but not failed.
|
# Update the dockercfg if not in check mode.
|
||||||
if self.has_changed() and not self.module.check_mode:
|
if not self.module.check_mode:
|
||||||
self.update_dockercfg()
|
self.update_dockercfg()
|
||||||
|
|
||||||
# This is what the underlaying docker-py unfortunately doesn't do (yet).
|
# This is what the underlaying docker-py unfortunately doesn't do (yet).
|
||||||
|
@ -182,9 +178,9 @@ class DockerLoginManager:
|
||||||
open(self.dockercfg_path, "w")
|
open(self.dockercfg_path, "w")
|
||||||
self.log.append("Created new Docker config file at %s" % self.dockercfg_path)
|
self.log.append("Created new Docker config file at %s" % self.dockercfg_path)
|
||||||
else:
|
else:
|
||||||
self.log.append("Updated existing Docker config file at %s" % self.dockercfg_path)
|
self.log.append("Found existing Docker config file at %s" % self.dockercfg_path)
|
||||||
|
|
||||||
# Get existing dockercfg into a dict.
|
# Build a dict for the existing dockercfg.
|
||||||
try:
|
try:
|
||||||
docker_config = json.load(open(self.dockercfg_path, "r"))
|
docker_config = json.load(open(self.dockercfg_path, "r"))
|
||||||
except ValueError:
|
except ValueError:
|
||||||
|
@ -193,16 +189,22 @@ class DockerLoginManager:
|
||||||
docker_config["auths"] = dict()
|
docker_config["auths"] = dict()
|
||||||
if not docker_config["auths"].has_key(self.registry):
|
if not docker_config["auths"].has_key(self.registry):
|
||||||
docker_config["auths"][self.registry] = dict()
|
docker_config["auths"][self.registry] = dict()
|
||||||
docker_config["auths"][self.registry] = dict(
|
|
||||||
|
# Calculate docker credentials based on current parameters.
|
||||||
|
new_docker_config = dict(
|
||||||
auth = base64.b64encode(self.username + b':' + self.password),
|
auth = base64.b64encode(self.username + b':' + self.password),
|
||||||
email = self.email
|
email = self.email
|
||||||
)
|
)
|
||||||
|
|
||||||
# Write updated dockercfg to dockercfg file.
|
# Update config if persisted credentials differ from current credentials.
|
||||||
try:
|
if new_docker_config != docker_config["auths"][self.registry]:
|
||||||
json.dump(docker_config, open(self.dockercfg_path, "w"), indent=4, sort_keys=True)
|
docker_config["auths"][self.registry] = new_docker_config
|
||||||
except Exception as e:
|
try:
|
||||||
self.module.fail_json(msg="failed to write auth details to file", error=repr(e))
|
json.dump(docker_config, open(self.dockercfg_path, "w"), indent=4, sort_keys=True)
|
||||||
|
except Exception as e:
|
||||||
|
self.module.fail_json(msg="failed to write auth details to file", error=repr(e))
|
||||||
|
self.log.append("Updated Docker config with new credentials.")
|
||||||
|
self.changed = True
|
||||||
|
|
||||||
# Compatible to docker-py auth.decode_docker_auth()
|
# Compatible to docker-py auth.decode_docker_auth()
|
||||||
def encode_docker_auth(self, auth):
|
def encode_docker_auth(self, auth):
|
||||||
|
|
Loading…
Reference in a new issue