diff options
author | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-03-25 23:43:50 +0100 |
---|---|---|
committer | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-03-25 23:43:50 +0100 |
commit | 3aabcf8aad49b784321fb75051a907bf0939ee78 (patch) | |
tree | d97894fd92fcfe363f92e061f80e4eb21585278c /node-admin/src | |
parent | 7418b967e3a405aed465af3037598424215efd60 (diff) |
Support adding container data file with permissions
Diffstat (limited to 'node-admin/src')
3 files changed, 14 insertions, 1 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java index 46fbbf7a72a..71e278ab23b 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java @@ -108,7 +108,7 @@ public class AthenzCredentialsMaintainer implements CredentialsMaintainer { try { context.log(logger, Level.FINE, "Checking certificate"); - ContainerPath containerSiaDirectory = context.paths().of(CONTAINER_SIA_DIRECTORY).withUser(context.users().vespa()); + ContainerPath containerSiaDirectory = context.paths().of(CONTAINER_SIA_DIRECTORY, context.users().vespa()); ContainerPath privateKeyFile = (ContainerPath) SiaUtils.getPrivateKeyFile(containerSiaDirectory, context.identity()); ContainerPath certificateFile = (ContainerPath) SiaUtils.getCertificateFile(containerSiaDirectory, context.identity()); ContainerPath identityDocumentFile = containerSiaDirectory.resolve("vespa-node-identity-document.json"); diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/ContainerData.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/ContainerData.java index 07e3268b9e4..26c3d101c69 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/ContainerData.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/ContainerData.java @@ -1,6 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.node.admin.nodeagent; +import com.yahoo.vespa.hosted.node.admin.task.util.file.UnixPath; import com.yahoo.vespa.hosted.node.admin.task.util.fs.ContainerPath; import java.nio.file.Path; @@ -15,6 +16,13 @@ public interface ContainerData { /** Add or overwrite file in container at path. */ void addFile(ContainerPath path, String data); + /** + * @param path Container path to write + * @param data UTF-8 file content + * @param permissions file permissions, see {@link UnixPath#setPermissions(String)} for format. + */ + void addFile(ContainerPath path, String data, String permissions); + /** Add directory in container at path. */ void addDirectory(ContainerPath path); diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java index ada36af89e1..9da7f1dbdb6 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java @@ -606,6 +606,11 @@ public class NodeAgentImpl implements NodeAgent { } @Override + public void addFile(ContainerPath path, String data, String permissions) { + throw new UnsupportedOperationException("addFile not implemented"); + } + + @Override public void addDirectory(ContainerPath path) { throw new UnsupportedOperationException("addDirectory not implemented"); } |