feat(entries): added UpdateEntry

Author: dion-gionet

authentication.go

@@ -13,6 +13,8 @@ type Client struct {
 	client     *http.Client
 	baseUri    string
 	credential credentials
+
+	ClientUser DvlsUser
 }
 
 type credentials struct {
@@ -80,7 +82,7 @@ const (
 	isLoggedEndpoint string = "/api/is-logged"
 )
 
-func NewClient(username string, password string, baseUri string) (Client, DvlsUser, error) {
+func NewClient(username string, password string, baseUri string) (Client, error) {
 	credential := credentials{username: username, password: password}
 	client := Client{
 		client:     &http.Client{},
@@ -90,10 +92,12 @@ func NewClient(username string, password string, baseUri string) (Client, DvlsUs
 
 	user, err := client.login()
 	if err != nil {
-		return Client{}, DvlsUser{}, fmt.Errorf("login failed \"%w\"", err)
+		return Client{}, fmt.Errorf("login failed \"%w\"", err)
 	}
 
-	return client, user, nil
+	client.ClientUser = user
+
+	return client, nil
 }
 
 func (c *Client) login() (DvlsUser, error) {

dvls_test.go

@@ -9,7 +9,6 @@ import (
 const testEntryId string = "76a4fcf6-fec1-4297-bc1e-a327841055ad"
 const testVaultId string = "e0f4f35d-8cb5-40d9-8b2b-35c96ea1c9b5"
 
-var testPassword string = "TestK8sPassword"
 var testNewEntry DvlsEntry
 var testEntry DvlsEntry = DvlsEntry{
 	ID:                testEntryId,
@@ -19,21 +18,18 @@ var testEntry DvlsEntry = DvlsEntry{
 	ConnectionType:    ServerConnectionCredential,
 	ConnectionSubType: ServerConnectionSubTypeDefault,
 	Tags:              []string{"Test tag 1", "Test tag 2", "testtag"},
-	Credentials: DvlsEntryCredentials{
-		Username: "TestK8s",
-		Password: &testPassword,
-	},
+	Credentials:       NewEntryCredentials("TestK8s", "TestK8sPassword"),
 }
 
 var testClient Client
 
 func Test_NewClient(t *testing.T) {
-	c, user, err := NewClient(os.Getenv("TEST_USER"), os.Getenv("TEST_PASSWORD"), os.Getenv("TEST_INSTANCE"))
+	c, err := NewClient(os.Getenv("TEST_USER"), os.Getenv("TEST_PASSWORD"), os.Getenv("TEST_INSTANCE"))
 	if err != nil {
 		t.Fatal(err)
 	}
-	if user.UserType != UserAuthenticationApplication {
-		t.Fatalf("user credentials is not an Application. User type %s", user.UserType)
+	if c.ClientUser.UserType != UserAuthenticationApplication {
+		t.Fatalf("user credentials is not an Application. User type %s", c.ClientUser.UserType)
 	}
 
 	testClient = c
@@ -42,15 +38,13 @@ func Test_NewClient(t *testing.T) {
 	t.Run("GetEntryCredentialsPassword", test_GetEntryCredentialsPassword)
 	t.Run("GetEntry", test_GetEntry)
 	t.Run("NewEntry", test_NewEntry)
+	t.Run("UpdateEntry", test_UpdateEntry)
 	t.Run("DeleteEntry", test_DeleteEntry)
 	t.Run("GetServerInfo", test_GetServerInfo)
 }
 
 func test_GetEntryCredentialsPassword(t *testing.T) {
-	testSecret := DvlsEntryCredentials{
-		Username: "TestK8s",
-		Password: &testPassword,
-	}
+	testSecret := testEntry.Credentials
 	secret, err := testClient.GetEntryCredentialsPassword(testEntry)
 	if err != nil {
 		t.Fatal(err)
@@ -96,6 +90,28 @@ func test_NewEntry(t *testing.T) {
 	if !reflect.DeepEqual(entry, testNewEntry) {
 		t.Fatalf("fetched entry did not match test entry. Expected %#v, got %#v", testNewEntry, entry)
 	}
+
+	testNewEntry = entry
+}
+
+func test_UpdateEntry(t *testing.T) {
+	testUpdatedEntry := testNewEntry
+	testUpdatedEntry.EntryName = "TestK8sUpdatedEntry"
+	testUpdatedEntry.Credentials = NewEntryCredentials("TestK8sUpdatedUser", "TestK8sUpdatedPassword")
+
+	entry, err := testClient.UpdateEntry(testUpdatedEntry)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	testUpdatedEntry.ModifiedDate = entry.ModifiedDate
+	testUpdatedEntry.Tags = entry.Tags
+
+	if !reflect.DeepEqual(entry, testUpdatedEntry) {
+		t.Fatalf("fetched entry did not match test entry. Expected %#v, got %#v", testUpdatedEntry, entry)
+	}
+
+	testNewEntry = entry
 }
 
 func test_DeleteEntry(t *testing.T) {

entries.go

@@ -27,6 +27,7 @@ type DvlsEntry struct {
 
 func (e DvlsEntry) MarshalJSON() ([]byte, error) {
 	raw := struct {
+		Id           string `json:"id,omitempty"`
 		RepositoryId string `json:"repositoryId"`
 		Name         string `json:"name"`
 		Description  string `json:"description"`
@@ -58,6 +59,7 @@ func (e DvlsEntry) MarshalJSON() ([]byte, error) {
 		}
 	}
 
+	raw.Id = e.ID
 	raw.Keywords = strings.Join(e.Tags, " ")
 	raw.Description = e.Description
 	raw.RepositoryId = e.VaultId
@@ -290,6 +292,38 @@ func (c *Client) NewEntry(entry DvlsEntry) (DvlsEntry, error) {
 	return entry, nil
 }
 
+func (c *Client) UpdateEntry(entry DvlsEntry) (DvlsEntry, error) {
+	if entry.ConnectionType != ServerConnectionCredential || entry.ConnectionSubType != ServerConnectionSubTypeDefault {
+		return DvlsEntry{}, fmt.Errorf("unsupported entry type (%s %s). Only %s %s is supported", entry.ConnectionType, entry.ConnectionSubType, ServerConnectionCredential, ServerConnectionSubTypeDefault)
+	}
+
+	entry.ModifiedDate = nil
+
+	reqUrl, err := url.JoinPath(c.baseUri, entryEndpoint, "save")
+	if err != nil {
+		return DvlsEntry{}, fmt.Errorf("failed to build entry url. error: %w", err)
+	}
+
+	entryJson, err := json.Marshal(entry)
+	if err != nil {
+		return DvlsEntry{}, fmt.Errorf("failed to marshall body. error: %w", err)
+	}
+
+	resp, err := c.Request(reqUrl, http.MethodPut, bytes.NewBuffer(entryJson))
+	if err != nil {
+		return DvlsEntry{}, fmt.Errorf("error while creating entry. error: %w", err)
+	} else if resp.Result != 1 {
+		return DvlsEntry{}, fmt.Errorf("unexpected result code %d %s", resp.Result, resp.Message)
+	}
+
+	err = json.Unmarshal(resp.Response, &entry)
+	if err != nil {
+		return DvlsEntry{}, fmt.Errorf("failed to unmarshall response body. error: %w", err)
+	}
+
+	return entry, nil
+}
+
 func (c *Client) DeleteEntry(entryId string) error {
 	reqUrl, err := url.JoinPath(c.baseUri, entryEndpoint, entryId)
 	if err != nil {
@@ -305,3 +339,11 @@ func (c *Client) DeleteEntry(entryId string) error {
 
 	return nil
 }
+
+func NewEntryCredentials(username string, password string) DvlsEntryCredentials {
+	creds := DvlsEntryCredentials{
+		Username: username,
+		Password: &password,
+	}
+	return creds
+}