[lxc-devel] [lxd/master] shared/api: Add API extension label to AuthMethods

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 354 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20171109/37f7384d/attachment.bin>
-------------- next part --------------
From b3cd56fc181613b14ee489317999d3945d8e38ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Thu, 9 Nov 2017 02:07:00 -0500
Subject: [PATCH] shared/api: Add API extension label to AuthMethods
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 shared/api/server.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/shared/api/server.go b/shared/api/server.go
index a986f062f..f1a3df29d 100644
--- a/shared/api/server.go
+++ b/shared/api/server.go
@@ -29,8 +29,11 @@ type ServerUntrusted struct {
 	APIStatus     string   `json:"api_status" yaml:"api_status"`
 	APIVersion    string   `json:"api_version" yaml:"api_version"`
 	Auth          string   `json:"auth" yaml:"auth"`
-	AuthMethods   []string `json:"auth_methods" yaml:"auth_methods"`
 	Public        bool     `json:"public" yaml:"public"`
+
+
+	// API extension: macaroon_authentication
+	AuthMethods   []string `json:"auth_methods" yaml:"auth_methods"`
 }
 
 // Server represents a LXD server