Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.12.2
0.13.0
9 changes: 5 additions & 4 deletions entry_credential.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
12 changes: 7 additions & 5 deletions entry_credential_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
}

Expand Down Expand Up @@ -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)
Expand Down
Loading