diff --git a/internal/credential/rotate.go b/internal/credential/rotate.go index 1f7b6ed..f8115fa 100644 --- a/internal/credential/rotate.go +++ b/internal/credential/rotate.go @@ -133,10 +133,10 @@ func (c *Config) RotateServiceAccountKey( Name: fmt.Sprintf("projects/%s/serviceAccounts/%s/keys/%s", newConfig.ProjectId, newConfig.ClientEmail, newConfig.PrivateKeyId), }) if rollbackErr != nil { - return status.Errorf(codes.PermissionDenied, "error validating rotated service account key: %v; error rolling back new rotated service account key: %v", err, rollbackErr) + return status.Errorf(codes.PermissionDenied, "error validating rotated service account key: %v; error rolling back newly created service account key: %v", err, rollbackErr) } - return status.Errorf(codes.PermissionDenied, "error validating rotated service account key: %v; successfully rolled back new rotated service account key", err) + return status.Errorf(codes.PermissionDenied, "error validating rotated service account key: %v; successfully rolled back newly created service account key", err) } newClient, err := admin.NewIamClient(ctx, clientOptions...) @@ -155,10 +155,10 @@ func (c *Config) RotateServiceAccountKey( }) // If rollback also fails, return an error indicating both the failure to delete the old key and the failure to roll back the new key. if rollbackErr != nil { - return status.Errorf(codes.Internal, "error deleting service account key: %v; error rolling back new rotated service account key: %v", err, rollbackErr) + return status.Errorf(codes.Internal, "error deleting service account key: %v; error rolling back newly created service account key: %v", err, rollbackErr) } - return status.Errorf(codes.Internal, "error deleting service account key: %v; successfully rolled back new rotated service account key", err) + return status.Errorf(codes.Internal, "error deleting service account key: %v; successfully rolled back newly created service account key", err) } c.PrivateKey = newConfig.PrivateKey diff --git a/internal/credential/rotate_test.go b/internal/credential/rotate_test.go index 56c4450..c90c0e8 100644 --- a/internal/credential/rotate_test.go +++ b/internal/credential/rotate_test.go @@ -92,7 +92,7 @@ func TestRotateServiceAccountKey(t *testing.T) { testIAMAdminServer.testDeleteServiceAccountKeyErrors = []error{nil} testResourceServer.testIamPermissionsError = errors.New("iam permissions error") }, - expectedError: errors.New("successfully rolled back new rotated service account key"), + expectedError: errors.New("successfully rolled back newly created service account key"), }, { name: "ValidateServiceAccountKey fails and rollback fails", @@ -108,7 +108,7 @@ func TestRotateServiceAccountKey(t *testing.T) { testIAMAdminServer.testDeleteServiceAccountKeyErrors = []error{errors.New("rollback key error")} testResourceServer.testIamPermissionsError = errors.New("iam permissions error") }, - expectedError: errors.New("error rolling back new rotated service account key"), + expectedError: errors.New("error rolling back newly created service account key"), }, { name: "DeleteServiceAccountKey old key fails and rollback fails", @@ -127,7 +127,7 @@ func TestRotateServiceAccountKey(t *testing.T) { } testResourceServer.testIamPermissionsError = nil }, - expectedError: errors.New("error rolling back new rotated service account key"), + expectedError: errors.New("error rolling back newly created service account key"), }, { name: "DeleteServiceAccountKey old key fails and rollback succeeds", @@ -146,7 +146,7 @@ func TestRotateServiceAccountKey(t *testing.T) { } testResourceServer.testIamPermissionsError = nil }, - expectedError: errors.New("successfully rolled back new rotated service account key"), + expectedError: errors.New("successfully rolled back newly created service account key"), }, { name: "Successful rotation",