spike-46 resolve merge conflicts and moved metadata entrypoints and r…

…esp reqs to sdk

.gitignore

@@ -53,6 +53,8 @@ go.work.sum
 .idea
 .code
 .history
+*.DS_Store
+*.iml
 
 # App-specific:
 .spike-token

app/demo/cmd/main.go

@@ -8,7 +8,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/spiffe/spike/app/demo/spike"
+	spike "github.com/spiffe/spike-sdk-go/api"
+
 	"github.com/spiffe/spike/pkg/spiffe"
 )
 

app/keeper/internal/route/store/keep.go

@@ -7,9 +7,11 @@ package store
 import (
 	"net/http"
 
+	"github.com/spiffe/spike-sdk-go/api/entity/data"
+	"github.com/spiffe/spike-sdk-go/api/entity/v1/reqres"
+	"github.com/spiffe/spike-sdk-go/api/errors"
+
 	"github.com/spiffe/spike/app/keeper/internal/state"
-	"github.com/spiffe/spike/internal/entity"
-	"github.com/spiffe/spike/internal/entity/v1/reqres"
 	"github.com/spiffe/spike/internal/log"
 	"github.com/spiffe/spike/internal/net"
 )
@@ -49,31 +51,31 @@ func RouteKeep(
 
 	requestBody := net.ReadRequestBody(w, r)
 	if requestBody == nil {
-		return entity.ErrReadFailure
+		return errors.ErrReadFailure
 	}
 
 	request := net.HandleRequest[
 		reqres.RootKeyCacheRequest, reqres.RootKeyCacheResponse](
 		requestBody, w,
-		reqres.RootKeyCacheResponse{Err: reqres.ErrBadInput},
+		reqres.RootKeyCacheResponse{Err: data.ErrBadInput},
 	)
 	if request == nil {
-		return entity.ErrParseFailure
+		return errors.ErrParseFailure
 	}
 
 	rootKey := request.RootKey
 	if rootKey == "" {
-		return entity.ErrMissingRootKey
+		return errors.ErrMissingRootKey
 	}
 
 	state.SetRootKey(rootKey)
 
 	responseBody := net.MarshalBody(reqres.RootKeyCacheResponse{}, w)
 	if responseBody == nil {
-		return entity.ErrMarshalFailure
+		return errors.ErrMarshalFailure
 	}
 
 	net.Respond(http.StatusOK, responseBody, w)
-	log.Log().Info(fName, "msg", reqres.ErrSuccess)
+	log.Log().Info(fName, "msg", data.ErrSuccess)
 	return nil
 }

app/keeper/internal/route/store/show.go

@@ -7,9 +7,11 @@ package store
 import (
 	"net/http"
 
+	"github.com/spiffe/spike-sdk-go/api/entity/data"
+	"github.com/spiffe/spike-sdk-go/api/entity/v1/reqres"
+	"github.com/spiffe/spike-sdk-go/api/errors"
 	"github.com/spiffe/spike/app/keeper/internal/state"
-	"github.com/spiffe/spike/internal/entity"
-	"github.com/spiffe/spike/internal/entity/v1/reqres"
+
 	"github.com/spiffe/spike/internal/log"
 	"github.com/spiffe/spike/internal/net"
 )
@@ -53,26 +55,26 @@ func RouteShow(
 
 	requestBody := net.ReadRequestBody(w, r)
 	if requestBody == nil {
-		return entity.ErrReadFailure
+		return errors.ErrReadFailure
 	}
 
 	request := net.HandleRequest[
 		reqres.RootKeyReadRequest, reqres.RootKeyReadResponse](
 		requestBody, w,
-		reqres.RootKeyReadResponse{Err: reqres.ErrBadInput},
+		reqres.RootKeyReadResponse{Err: data.ErrBadInput},
 	)
 	if request == nil {
-		return entity.ErrParseFailure
+		return errors.ErrParseFailure
 	}
 
 	responseBody := net.MarshalBody(
 		reqres.RootKeyReadResponse{RootKey: state.RootKey()}, w,
 	)
 	if responseBody == nil {
-		return entity.ErrMarshalFailure
+		return errors.ErrMarshalFailure
 	}
 
 	net.Respond(http.StatusOK, responseBody, w)
-	log.Log().Info(fName, "msg", reqres.ErrSuccess)
+	log.Log().Info(fName, "msg", data.ErrSuccess)
 	return nil
 }

app/nexus/internal/env/backend.go

@@ -40,7 +40,6 @@ func BackendStoreType() StoreType {
 	switch strings.ToLower(st) {
 	case string(S3):
 		panic("SPIKE_NEXUS_BACKEND_STORE=s3 is not implemented yet")
-		return S3
 	case string(Sqlite):
 		return Sqlite
 	case string(Memory):

app/nexus/internal/net/cache/net.go

@@ -9,10 +9,10 @@ import (
 
 	"github.com/go-jose/go-jose/v4/json"
 	"github.com/spiffe/go-spiffe/v2/workloadapi"
+	"github.com/spiffe/spike-sdk-go/api/entity/v1/reqres"
 
 	"github.com/spiffe/spike/app/nexus/internal/net/api"
 	"github.com/spiffe/spike/internal/auth"
-	"github.com/spiffe/spike/internal/entity/v1/reqres"
 	"github.com/spiffe/spike/internal/net"
 )
 

app/nexus/internal/route/acl/policy/create.go

@@ -5,13 +5,14 @@
 package policy
 
 import (
+	"github.com/spiffe/spike-sdk-go/api/errors"
 	"net/http"
 	"time"
 
+	"github.com/spiffe/spike-sdk-go/api/entity/data"
+	"github.com/spiffe/spike-sdk-go/api/entity/v1/reqres"
+
 	state "github.com/spiffe/spike/app/nexus/internal/state/base"
-	"github.com/spiffe/spike/internal/entity"
-	"github.com/spiffe/spike/internal/entity/data"
-	"github.com/spiffe/spike/internal/entity/v1/reqres"
 	"github.com/spiffe/spike/internal/log"
 	"github.com/spiffe/spike/internal/net"
 	"github.com/spiffe/spike/pkg/spiffe"
@@ -66,16 +67,16 @@ func RoutePutPolicy(
 
 	requestBody := net.ReadRequestBody(w, r)
 	if requestBody == nil {
-		return entity.ErrParseFailure
+		return errors.ErrParseFailure
 	}
 
 	request := net.HandleRequest[
 		reqres.PolicyCreateRequest, reqres.PolicyCreateResponse](
 		requestBody, w,
-		reqres.PolicyCreateResponse{Err: reqres.ErrBadInput},
+		reqres.PolicyCreateResponse{Err: data.ErrBadInput},
 	)
 	if request == nil {
-		return entity.ErrReadFailure
+		return errors.ErrReadFailure
 	}
 
 	// TODO: sanitize
@@ -88,7 +89,7 @@ func RoutePutPolicy(
 	spiffeid, err := spiffe.IdFromRequest(r)
 	if err != nil {
 		responseBody := net.MarshalBody(reqres.PolicyCreateResponse{
-			Err: reqres.ErrUnauthorized,
+			Err: data.ErrUnauthorized,
 		}, w)
 		net.Respond(http.StatusUnauthorized, responseBody, w)
 		return err
@@ -100,10 +101,10 @@ func RoutePutPolicy(
 	)
 	if !allowed {
 		responseBody := net.MarshalBody(reqres.PolicyCreateResponse{
-			Err: reqres.ErrUnauthorized,
+			Err: data.ErrUnauthorized,
 		}, w)
 		net.Respond(http.StatusUnauthorized, responseBody, w)
-		return entity.ErrUnauthorized
+		return errors.ErrUnauthorized
 	}
 
 	policy, err := state.CreatePolicy(data.Policy{
@@ -119,11 +120,11 @@ func RoutePutPolicy(
 		log.Log().Info(fName, "msg", "Failed to create policy", "err", err)
 
 		responseBody := net.MarshalBody(reqres.PolicyCreateResponse{
-			Err: reqres.ErrInternal,
+			Err: data.ErrInternal,
 		}, w)
 
 		net.Respond(http.StatusInternalServerError, responseBody, w)
-		log.Log().Error(fName, "msg", reqres.ErrInternal)
+		log.Log().Error(fName, "msg", data.ErrInternal)
 
 		return err
 	}
@@ -133,7 +134,7 @@ func RoutePutPolicy(
 	}, w)
 
 	net.Respond(http.StatusOK, responseBody, w)
-	log.Log().Info(fName, "msg", reqres.ErrSuccess)
+	log.Log().Info(fName, "msg", data.ErrSuccess)
 
 	return nil
 }

app/nexus/internal/route/acl/policy/delete.go

@@ -7,10 +7,11 @@ package policy
 import (
 	"net/http"
 
+	"github.com/spiffe/spike-sdk-go/api/entity/data"
+	"github.com/spiffe/spike-sdk-go/api/entity/v1/reqres"
+	"github.com/spiffe/spike-sdk-go/api/errors"
+
 	state "github.com/spiffe/spike/app/nexus/internal/state/base"
-	"github.com/spiffe/spike/internal/entity"
-	"github.com/spiffe/spike/internal/entity/data"
-	"github.com/spiffe/spike/internal/entity/v1/reqres"
 	"github.com/spiffe/spike/internal/log"
 	"github.com/spiffe/spike/internal/net"
 	"github.com/spiffe/spike/pkg/spiffe"
@@ -62,24 +63,24 @@ func RouteDeletePolicy(
 
 	requestBody := net.ReadRequestBody(w, r)
 	if requestBody == nil {
-		return entity.ErrReadFailure
+		return errors.ErrReadFailure
 	}
 
 	request := net.HandleRequest[
 		reqres.PolicyDeleteRequest, reqres.PolicyDeleteResponse](
 		requestBody, w,
-		reqres.PolicyDeleteResponse{Err: reqres.ErrBadInput},
+		reqres.PolicyDeleteResponse{Err: data.ErrBadInput},
 	)
 	if request == nil {
-		return entity.ErrParseFailure
+		return errors.ErrParseFailure
 	}
 
 	policyId := request.Id
 
 	spiffeid, err := spiffe.IdFromRequest(r)
 	if err != nil {
 		responseBody := net.MarshalBody(reqres.PolicyDeleteResponse{
-			Err: reqres.ErrUnauthorized,
+			Err: data.ErrUnauthorized,
 		}, w)
 		net.Respond(http.StatusUnauthorized, responseBody, w)
 		return err
@@ -90,34 +91,34 @@ func RouteDeletePolicy(
 	)
 	if !allowed {
 		responseBody := net.MarshalBody(reqres.PolicyDeleteResponse{
-			Err: reqres.ErrUnauthorized,
+			Err: data.ErrUnauthorized,
 		}, w)
 		net.Respond(http.StatusUnauthorized, responseBody, w)
-		return entity.ErrUnauthorized
+		return errors.ErrUnauthorized
 	}
 
 	err = state.DeletePolicy(policyId)
 	if err != nil {
 		log.Log().Info(fName, "msg", "Failed to delete policy", "err", err)
 
 		responseBody := net.MarshalBody(reqres.PolicyDeleteResponse{
-			Err: reqres.ErrInternal,
+			Err: data.ErrInternal,
 		}, w)
 		if responseBody == nil {
-			return entity.ErrMarshalFailure
+			return errors.ErrMarshalFailure
 		}
 
 		net.Respond(http.StatusInternalServerError, responseBody, w)
-		log.Log().Info(fName, "msg", reqres.ErrInternal)
+		log.Log().Info(fName, "msg", data.ErrInternal)
 		return err
 	}
 
 	responseBody := net.MarshalBody(reqres.PolicyDeleteResponse{}, w)
 	if responseBody == nil {
-		return entity.ErrMarshalFailure
+		return errors.ErrMarshalFailure
 	}
 
 	net.Respond(http.StatusOK, responseBody, w)
-	log.Log().Info(fName, "msg", reqres.ErrSuccess)
+	log.Log().Info(fName, "msg", data.ErrSuccess)
 	return nil
 }

app/nexus/internal/route/acl/policy/list.go

@@ -7,10 +7,11 @@ package policy
 import (
 	"net/http"
 
+	"github.com/spiffe/spike-sdk-go/api/entity/data"
+	"github.com/spiffe/spike-sdk-go/api/entity/v1/reqres"
+	"github.com/spiffe/spike-sdk-go/api/errors"
+
 	state "github.com/spiffe/spike/app/nexus/internal/state/base"
-	"github.com/spiffe/spike/internal/entity"
-	"github.com/spiffe/spike/internal/entity/data"
-	"github.com/spiffe/spike/internal/entity/v1/reqres"
 	"github.com/spiffe/spike/internal/log"
 	"github.com/spiffe/spike/internal/net"
 	"github.com/spiffe/spike/pkg/spiffe"
@@ -70,22 +71,22 @@ func RouteListPolicies(
 
 	requestBody := net.ReadRequestBody(w, r)
 	if requestBody == nil {
-		return entity.ErrReadFailure
+		return errors.ErrReadFailure
 	}
 
 	request := net.HandleRequest[
 		reqres.PolicyListRequest, reqres.PolicyListResponse](
 		requestBody, w,
-		reqres.PolicyListResponse{Err: reqres.ErrBadInput},
+		reqres.PolicyListResponse{Err: data.ErrBadInput},
 	)
 	if request == nil {
-		return entity.ErrParseFailure
+		return errors.ErrParseFailure
 	}
 
 	spiffeid, err := spiffe.IdFromRequest(r)
 	if err != nil {
 		responseBody := net.MarshalBody(reqres.PolicyListResponse{
-			Err: reqres.ErrUnauthorized,
+			Err: data.ErrUnauthorized,
 		}, w)
 		net.Respond(http.StatusUnauthorized, responseBody, w)
 		return err
@@ -96,10 +97,10 @@ func RouteListPolicies(
 	)
 	if !allowed {
 		responseBody := net.MarshalBody(reqres.PolicyListResponse{
-			Err: reqres.ErrUnauthorized,
+			Err: data.ErrUnauthorized,
 		}, w)
 		net.Respond(http.StatusUnauthorized, responseBody, w)
-		return entity.ErrUnauthorized
+		return errors.ErrUnauthorized
 	}
 
 	policies := state.ListPolicies()
@@ -108,10 +109,10 @@ func RouteListPolicies(
 		Policies: policies,
 	}, w)
 	if responseBody == nil {
-		return entity.ErrMarshalFailure
+		return errors.ErrMarshalFailure
 	}
 
 	net.Respond(http.StatusOK, responseBody, w)
-	log.Log().Info(fName, "msg", reqres.ErrSuccess)
+	log.Log().Info(fName, "msg", data.ErrSuccess)
 	return nil
 }