feat!: support username + password in private key secret entry

Author: Sylfwood

.github/workflows/test.yml

@@ -70,7 +70,6 @@ jobs:
           TEST_CERTIFICATE_ENTRY_ID: ${{ secrets.TEST_CERTIFICATE_ENTRY_ID }}
           TEST_CERTIFICATE_FILE_PATH: '${{ runner.temp }}/test.p12'
           TEST_HOST_ENTRY_ID: ${{ secrets.TEST_HOST_ENTRY_ID }}
-          TEST_USER_ENTRY_ID: ${{ secrets.TEST_USER_ENTRY_ID }}
           TEST_WEBSITE_ENTRY_ID: ${{ secrets.TEST_WEBSITE_ENTRY_ID }}
         with:
           github_token: ${{ secrets.DEVOLUTIONSBOT_TOKEN }}

VERSION

@@ -1 +1 @@
-0.12.2
+0.13.0

entry_credential.go

@@ -48,10 +48,11 @@ type EntryCredentialDefaultData struct {
 }
 
 type EntryCredentialPrivateKeyData struct {
-	PrivateKey       string `json:"privateKeyData,omitempty"`
-	PublicKey        string `json:"publicKeyData,omitempty"`
-	OverridePassword string `json:"privateKeyOverridePassword,omitempty"`
-	Passphrase       string `json:"privateKeyPassPhrase,omitempty"`
+	Username   string `json:"privateKeyOverrideUsername,omitempty"`
+	Password   string `json:"privateKeyOverridePassword,omitempty"`
+	PrivateKey string `json:"privateKeyData,omitempty"`
+	PublicKey  string `json:"publicKeyData,omitempty"`
+	Passphrase string `json:"privateKeyPassPhrase,omitempty"`
 }
 
 func (e *Entry) GetCredentialAccessCodeData() (*EntryCredentialAccessCodeData, bool) {

entry_credential_test.go

@@ -201,10 +201,11 @@ func test_NewUserEntry(t *testing.T) {
 		Tags:        []string{"testtag"},
 
 		Data: EntryCredentialPrivateKeyData{
-			PrivateKey:       "-----BEGIN PRIVATE KEY-----\abcdefghijklmnopqrstuvwxyz1234567890...\n-----END PRIVATE",
-			PublicKey:        "-----BEGIN PUBLIC KEY-----\abcdefghijklmnopqrstuvwxyz...\n-----END PUBLIC KEY-----",
-			OverridePassword: "override-password",
-			Passphrase:       "passphrase",
+			Username:   "testuser",
+			Password:   "password",
+			PrivateKey: "-----BEGIN PRIVATE KEY-----\abcdefghijklmnopqrstuvwxyz1234567890...\n-----END PRIVATE",
+			PublicKey:  "-----BEGIN PUBLIC KEY-----\abcdefghijklmnopqrstuvwxyz...\n-----END PUBLIC KEY-----",
+			Passphrase: "passphrase",
 		},
 	}
 
@@ -404,8 +405,9 @@ func test_UpdateUserEntry(t *testing.T) {
 	if !ok {
 		t.Fatalf("Failed to get credential access code data from entry: %v", updatedCredentialAccessCodeEntry)
 	}
+	updatedPrivateKeyData.Username = updatedPrivateKeyData.Username + "-updated"
+	updatedPrivateKeyData.Password = updatedPrivateKeyData.Password + "-updated"
 	updatedPrivateKeyData.Passphrase = updatedPrivateKeyData.Passphrase + "-updated"
-	updatedPrivateKeyData.OverridePassword = updatedPrivateKeyData.OverridePassword + "-updated"
 	updatedCredentialPrivateKeyEntry.Data = updatedPrivateKeyData
 
 	updatedCredentialPrivateKeyEntry, err = testClient.Entries.Credential.Update(updatedCredentialPrivateKeyEntry)