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
6 changes: 3 additions & 3 deletions pkg/rid/operations/subscription.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ func init() {
Registry[ridv1.DeleteSubscriptionOperationID] = dssstore.OperationHandler[repos.Repository]{
Encode: dssstore.EncodeJSON,
Decode: dssstore.DecodeJSON[*ridv1.DeleteSubscriptionRequest],
Execute: ExecuteDeleteSubscription,
Execute: executeDeleteSubscription,
}
Registry[ridv2.DeleteSubscriptionOperationID] = dssstore.OperationHandler[repos.Repository]{
Encode: dssstore.EncodeJSON,
Decode: dssstore.DecodeJSON[*ridv2.DeleteSubscriptionRequest],
Execute: ExecuteDeleteSubscription,
Execute: executeDeleteSubscription,
}
}

func ExecuteDeleteSubscription(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
func executeDeleteSubscription(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
var (
rawID string
rawVersion string
Expand Down
8 changes: 4 additions & 4 deletions pkg/scd/operations/availability.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ func init() {
Registry[restapi.GetUssAvailabilityOperationID] = dssstore.OperationHandler[repos.Repository]{
Encode: dssstore.EncodeJSON,
Decode: dssstore.DecodeJSON[*restapi.GetUssAvailabilityRequest],
Execute: ExecuteGetUssAvailability,
Execute: executeGetUssAvailability,
IsReadOnly: true,
}
Registry[restapi.SetUssAvailabilityOperationID] = dssstore.OperationHandler[repos.Repository]{
Encode: dssstore.EncodeJSON,
Decode: dssstore.DecodeJSON[*restapi.SetUssAvailabilityRequest],
Execute: ExecuteSetUssAvailability,
Execute: executeSetUssAvailability,
}
}

func ExecuteGetUssAvailability(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
func executeGetUssAvailability(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
req, ok := request.(*restapi.GetUssAvailabilityRequest)
if !ok {
return nil, stacktrace.NewError("unexpected request type %T for operation %q", request, restapi.GetUssAvailabilityOperationID)
Expand Down Expand Up @@ -55,7 +55,7 @@ func ExecuteGetUssAvailability(ctx context.Context, repo repos.Repository, reque
}, nil
}

func ExecuteSetUssAvailability(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
func executeSetUssAvailability(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
req, ok := request.(*restapi.SetUssAvailabilityRequest)
if !ok {
return nil, stacktrace.NewError("unexpected request type %T for operation %q", request, restapi.SetUssAvailabilityOperationID)
Expand Down
20 changes: 10 additions & 10 deletions pkg/scd/operations/constraint.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,33 +20,33 @@ func init() {
Registry[restapi.DeleteConstraintReferenceOperationID] = dssstore.OperationHandler[repos.Repository]{
Encode: dssstore.EncodeJSON,
Decode: dssstore.DecodeJSON[*restapi.DeleteConstraintReferenceRequest],
Execute: ExecuteDeleteConstraint,
Execute: executeDeleteConstraint,
}
Registry[restapi.GetConstraintReferenceOperationID] = dssstore.OperationHandler[repos.Repository]{
Encode: dssstore.EncodeJSON,
Decode: dssstore.DecodeJSON[*restapi.GetConstraintReferenceRequest],
Execute: ExecuteGetConstraint,
Execute: executeGetConstraint,
IsReadOnly: true,
}
Registry[restapi.CreateConstraintReferenceOperationID] = dssstore.OperationHandler[repos.Repository]{
Encode: dssstore.EncodeJSON,
Decode: dssstore.DecodeJSON[*restapi.CreateConstraintReferenceRequest],
Execute: ExecutePutConstraint,
Execute: executePutConstraint,
}
Registry[restapi.UpdateConstraintReferenceOperationID] = dssstore.OperationHandler[repos.Repository]{
Encode: dssstore.EncodeJSON,
Decode: dssstore.DecodeJSON[*restapi.UpdateConstraintReferenceRequest],
Execute: ExecutePutConstraint,
Execute: executePutConstraint,
}
Registry[restapi.QueryConstraintReferencesOperationID] = dssstore.OperationHandler[repos.Repository]{
Encode: dssstore.EncodeJSON,
Decode: dssstore.DecodeJSON[*restapi.QueryConstraintReferencesRequest],
Execute: ExecuteQueryConstraintReferences,
Execute: executeQueryConstraintReferences,
IsReadOnly: true,
}
}

func ExecuteGetConstraint(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
func executeGetConstraint(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
req, ok := request.(*restapi.GetConstraintReferenceRequest)
if !ok {
return nil, stacktrace.NewError("unexpected request type %T for operation %q", request, restapi.GetConstraintReferenceOperationID)
Expand Down Expand Up @@ -75,9 +75,9 @@ func ExecuteGetConstraint(ctx context.Context, repo repos.Repository, request ds
}, nil
}

// ExecutePutConstraint inserts or updates a Constraint.
// executePutConstraint inserts or updates a Constraint.
// If ovn is empty (""), it will attempt to create a new Constraint.
func ExecutePutConstraint(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
func executePutConstraint(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
var (
manager string
entityid restapi.EntityID
Expand Down Expand Up @@ -230,7 +230,7 @@ func ValidateAndReturnConstraintUpsertParams(
return valid, nil
}

func ExecuteQueryConstraintReferences(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
func executeQueryConstraintReferences(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
req, ok := request.(*restapi.QueryConstraintReferencesRequest)
if !ok {
return nil, stacktrace.NewError("unexpected request type %T for operation %q", request, restapi.QueryConstraintReferencesOperationID)
Expand Down Expand Up @@ -270,7 +270,7 @@ func ExecuteQueryConstraintReferences(ctx context.Context, repo repos.Repository
return response, nil
}

func ExecuteDeleteConstraint(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
func executeDeleteConstraint(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
req, ok := request.(*restapi.DeleteConstraintReferenceRequest)
if !ok {
return nil, stacktrace.NewError("unexpected request type %T for operation %q", request, restapi.DeleteConstraintReferenceOperationID)
Expand Down
22 changes: 11 additions & 11 deletions pkg/scd/operations/operational_intents.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,29 +22,29 @@ func init() {
Registry[restapi.GetOperationalIntentReferenceOperationID] = dssstore.OperationHandler[repos.Repository]{
Encode: dssstore.EncodeJSON,
Decode: dssstore.DecodeJSON[*restapi.GetOperationalIntentReferenceRequest],
Execute: ExecuteGetOperationalIntentReference,
Execute: executeGetOperationalIntentReference,
IsReadOnly: true,
}
Registry[restapi.QueryOperationalIntentReferencesOperationID] = dssstore.OperationHandler[repos.Repository]{
Encode: dssstore.EncodeJSON,
Decode: dssstore.DecodeJSON[*restapi.QueryOperationalIntentReferencesRequest],
Execute: ExecuteQueryOperationalIntentReferences,
Execute: executeQueryOperationalIntentReferences,
IsReadOnly: true,
}
Registry[restapi.DeleteOperationalIntentReferenceOperationID] = dssstore.OperationHandler[repos.Repository]{
Encode: dssstore.EncodeJSON,
Decode: dssstore.DecodeJSON[*restapi.DeleteOperationalIntentReferenceRequest],
Execute: ExecuteDeleteOperationalIntentReference,
Execute: executeDeleteOperationalIntentReference,
}
Registry[restapi.CreateOperationalIntentReferenceOperationID] = dssstore.OperationHandler[repos.Repository]{
Encode: dssstore.EncodeJSON,
Decode: dssstore.DecodeJSON[*restapi.CreateOperationalIntentReferenceRequest],
Execute: ExecutePutOperationalIntentReference,
Execute: executePutOperationalIntentReference,
}
Registry[restapi.UpdateOperationalIntentReferenceOperationID] = dssstore.OperationHandler[repos.Repository]{
Encode: dssstore.EncodeJSON,
Decode: dssstore.DecodeJSON[*restapi.UpdateOperationalIntentReferenceRequest],
Execute: ExecutePutOperationalIntentReference,
Execute: executePutOperationalIntentReference,
}
}

Expand Down Expand Up @@ -79,9 +79,9 @@ func SubscriptionIsImplicitAndOnlyAttachedToOIR(ctx context.Context, r repos.Rep
return false, nil
}

// ExecuteDeleteOperationalIntentReference deletes a single operational intent ref for a given ID
// executeDeleteOperationalIntentReference deletes a single operational intent ref for a given ID
// at the specified version.
func ExecuteDeleteOperationalIntentReference(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
func executeDeleteOperationalIntentReference(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
req, ok := request.(*restapi.DeleteOperationalIntentReferenceRequest)
if !ok {
return nil, stacktrace.NewError("unexpected request type %T for operation %q", request, restapi.DeleteOperationalIntentReferenceOperationID)
Expand Down Expand Up @@ -182,7 +182,7 @@ func ExecuteDeleteOperationalIntentReference(ctx context.Context, repo repos.Rep
}, nil
}

func ExecuteGetOperationalIntentReference(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
func executeGetOperationalIntentReference(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
req, ok := request.(*restapi.GetOperationalIntentReferenceRequest)
if !ok {
return nil, stacktrace.NewError("unexpected request type %T for operation %q", request, restapi.GetOperationalIntentReferenceOperationID)
Expand Down Expand Up @@ -210,7 +210,7 @@ func ExecuteGetOperationalIntentReference(ctx context.Context, repo repos.Reposi
}, nil
}

func ExecuteQueryOperationalIntentReferences(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
func executeQueryOperationalIntentReferences(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
req, ok := request.(*restapi.QueryOperationalIntentReferencesRequest)
if !ok {
return nil, stacktrace.NewError("unexpected request type %T for operation %q", request, restapi.QueryOperationalIntentReferencesOperationID)
Expand Down Expand Up @@ -644,9 +644,9 @@ type PutOperationalIntentReferenceResult struct {
Conflict *restapi.AirspaceConflictResponse
}

// ExecutePutOperationalIntentReference inserts or updates an Operational Intent.
// executePutOperationalIntentReference inserts or updates an Operational Intent.
// If the ovn argument is empty (""), it will attempt to create a new Operational Intent.
func ExecutePutOperationalIntentReference(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
func executePutOperationalIntentReference(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
var (
entityid restapi.EntityID
ovn restapi.EntityOVN
Expand Down
18 changes: 9 additions & 9 deletions pkg/scd/operations/subscription.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,33 +19,33 @@ func init() {
Registry[restapi.CreateSubscriptionOperationID] = dssstore.OperationHandler[repos.Repository]{
Encode: dssstore.EncodeJSON,
Decode: dssstore.DecodeJSON[*restapi.CreateSubscriptionRequest],
Execute: ExecutePutSubscription,
Execute: executePutSubscription,
}
Registry[restapi.UpdateSubscriptionOperationID] = dssstore.OperationHandler[repos.Repository]{
Encode: dssstore.EncodeJSON,
Decode: dssstore.DecodeJSON[*restapi.UpdateSubscriptionRequest],
Execute: ExecutePutSubscription,
Execute: executePutSubscription,
}
Registry[restapi.DeleteSubscriptionOperationID] = dssstore.OperationHandler[repos.Repository]{
Encode: dssstore.EncodeJSON,
Decode: dssstore.DecodeJSON[*restapi.DeleteSubscriptionRequest],
Execute: ExecuteDeleteSubscription,
Execute: executeDeleteSubscription,
}
Registry[restapi.GetSubscriptionOperationID] = dssstore.OperationHandler[repos.Repository]{
Encode: dssstore.EncodeJSON,
Decode: dssstore.DecodeJSON[*restapi.GetSubscriptionRequest],
Execute: ExecuteGetSubscription,
Execute: executeGetSubscription,
IsReadOnly: true,
}
Registry[restapi.QuerySubscriptionsOperationID] = dssstore.OperationHandler[repos.Repository]{
Encode: dssstore.EncodeJSON,
Decode: dssstore.DecodeJSON[*restapi.QuerySubscriptionsRequest],
Execute: ExecuteQuerySubscriptions,
Execute: executeQuerySubscriptions,
IsReadOnly: true,
}
}

func ExecutePutSubscription(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
func executePutSubscription(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
var (
manager string
subscriptionid restapi.SubscriptionID
Expand Down Expand Up @@ -253,7 +253,7 @@ func getOperations(ctx context.Context, r repos.Repository, opIDs []dssmodels.ID
return res, nil
}

func ExecuteDeleteSubscription(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
func executeDeleteSubscription(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
req, ok := request.(*restapi.DeleteSubscriptionRequest)
if !ok {
return nil, stacktrace.NewError("unexpected request type %T for operation %q", request, restapi.DeleteSubscriptionOperationID)
Expand Down Expand Up @@ -305,7 +305,7 @@ func ExecuteDeleteSubscription(ctx context.Context, repo repos.Repository, reque
return &restapi.DeleteSubscriptionResponse{Subscription: *p}, nil
}

func ExecuteGetSubscription(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
func executeGetSubscription(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
req, ok := request.(*restapi.GetSubscriptionRequest)
if !ok {
return nil, stacktrace.NewError("unexpected request type %T for operation %q", request, restapi.GetSubscriptionOperationID)
Expand Down Expand Up @@ -349,7 +349,7 @@ func ExecuteGetSubscription(ctx context.Context, repo repos.Repository, request
return &restapi.GetSubscriptionResponse{Subscription: *p}, nil
}

func ExecuteQuerySubscriptions(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
func executeQuerySubscriptions(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
req, ok := request.(*restapi.QuerySubscriptionsRequest)
if !ok {
return nil, stacktrace.NewError("unexpected request type %T for operation %q", request, restapi.QuerySubscriptionsOperationID)
Expand Down
Loading