Fix UpdateCredential func

management/client.go

@@ -297,8 +297,21 @@ func (m *ClientManager) CreateCredential(clientID string, credential *Credential
 
 // UpdateCredential updates a client application's client credential expiry.
 func (m *ClientManager) UpdateCredential(clientID, credentialID string, credential *Credential, opts ...RequestOption) error {
-	credential = &Credential{ExpiresAt: credential.ExpiresAt} // The API only accepts the expires_at property.
-	return m.Request("PATCH", m.URI("clients", clientID, "credentials", credentialID), credential, opts...)
+	credentialClone := &Credential{ExpiresAt: credential.ExpiresAt} // The API only accepts the expires_at property.
+
+	defer func() {
+		credential.ID = credentialClone.ID
+		credential.Name = credentialClone.Name
+		credential.CredentialType = credentialClone.CredentialType
+		credential.KeyID = credentialClone.KeyID
+		credential.Algorithm = credentialClone.Algorithm
+		credential.CreatedAt = credentialClone.CreatedAt
+		credential.UpdatedAt = credentialClone.UpdatedAt
+		credential.ExpiresAt = credentialClone.ExpiresAt
+		// PEM and ParseExpiryFromCert don't get returned.
+	}()
+
+	return m.Request("PATCH", m.URI("clients", clientID, "credentials", credentialID), credentialClone, opts...)
 }
 
 // ListCredentials lists all client credentials associated with the client application.

management/client_test.go

@@ -195,10 +195,16 @@ func TestClient_UpdateCredential(t *testing.T) {
 	expiresAt := time.Now().Add(time.Minute * 10)
 	expectedCredential.ExpiresAt = &expiresAt
 
-	err := api.Client.UpdateCredential(expectedClient.GetClientID(), expectedCredential.GetID(), expectedCredential)
+	pem := expectedCredential.GetPEM()
+	credentialID := expectedCredential.GetID()
+	expectedCredential.ID = nil
+
+	err := api.Client.UpdateCredential(expectedClient.GetClientID(), credentialID, expectedCredential)
 
 	assert.NoError(t, err)
 	assert.Equal(t, expectedCredential.GetExpiresAt(), expiresAt)
+	assert.Equal(t, expectedCredential.GetID(), credentialID) // Check that we unmarshall the result into this struct.
+	assert.Equal(t, expectedCredential.GetPEM(), pem)
 }
 
 func TestClient_DeleteCredential(t *testing.T) {