1 files changed, 4 insertions, 4 deletions

diff --git a/app/controllers/api_account.go b/app/controllers/api_account.go
index 815daf4..cecd334 100644
--- a/app/controllers/api_account.go
+++ b/app/controllers/api_account.go
@@ -2,14 +2,12 @@ package controllers
 
 import (
         "context"
-        "fmt"
         "net/http"
         "time"
 
         "code.crute.us/mcrute/cloud-identity-broker/app"
         "code.crute.us/mcrute/cloud-identity-broker/app/middleware"
         "code.crute.us/mcrute/cloud-identity-broker/app/models"
-        "code.crute.us/mcrute/cloud-identity-broker/cloud/aws"
 
         glecho "code.crute.us/mcrute/golib/echo"
         "code.crute.us/mcrute/golib/echo/controller"
@@ -90,7 +88,7 @@ func (h *APIAccountHandler) HandleGet(c echo.Context) error {
         // details about the account so they should only be visible to users who
         // can administer the account.
         if !a.CanBeModifiedBy(p) {
-                a.VaultMaterial = ""
+                a.AdminVaultMaterial = ""
                 a.Users = nil
         }
 
@@ -136,7 +134,7 @@ func (h *APIAccountHandler) HandlePut(c echo.Context) error {
         a.AccountNumber = in.AccountNumber
         a.Name = in.Name
         a.ConsoleSessionDuration = in.ConsoleSessionDuration
-        a.VaultMaterial = in.VaultMaterial
+        a.AdminVaultMaterial = in.AdminVaultMaterial
         a.DefaultRegion = in.DefaultRegion
         a.Users = in.Users
 
@@ -181,12 +179,14 @@ func (h *APIAccountHandler) HandlePost(c echo.Context) error {
                 }
         }
 
+        /* TODO: Validate that the vault material exists
         if err := aws.ValidateVaultMaterial(in.VaultMaterial); err != nil {
                 return &echo.HTTPError{
                         Code:    http.StatusBadRequest,
                         Message: fmt.Sprintf("Unable to access Vault material: %s", err),
                 }
         }
+        */
 
         if err := h.Store.Put(context.Background(), &in); err != nil {
                 return echo.ErrInternalServerError