[raft] Add tests in CI

.github/workflows/ci.yml

@@ -140,6 +140,41 @@ jobs:
       - name: Bring down local DSS instance
         run: make down-locally
 
+  dss-tests-with-raft:
+    name: DSS tests with Raft
+    runs-on: ubuntu-latest
+    env:
+      COMPOSE_PROFILES: with-raft
+    steps:
+      - name: Job information
+        run: |
+          echo "Job information"
+          echo "Trigger: ${{ github.event_name }}"
+          echo "Host: ${{ runner.os }}"
+          echo "Repository: ${{ github.repository }}"
+          echo "Branch: ${{ github.ref }}"
+          docker images
+          go env
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          submodules: true
+      - name: Build dss image
+        run: make build-dss
+      - name: Tear down any pre-existing local DSS instance
+        run: make down-locally
+      - name: Start local DSS instance
+        run: make start-locally
+      - name: Probe local DSS instance
+        run: make probe-locally
+      - name: Run Qualifier against local DSS instance
+        run: make qualify-locally
+      # Todo: Re add evict tests here once evict is implemented.
+      - name: Run security tests against local DSS instance
+        run: make security-locally
+      - name: Bring down local DSS instance
+        run: make down-locally
+
   certificates-management-tests:
     name: Certificate management tests
     runs-on: ubuntu-latest

Makefile

@@ -157,7 +157,6 @@ test-go-units-crdb: cleanup-test-go-units-crdb
 	go run ./cmds/db-manager/main.go migrate --schemas_dir ./build/db_schemas/scd --db_version latest --datastore_host localhost
 	go run ./cmds/db-manager/main.go migrate --schemas_dir ./build/db_schemas/aux_ --db_version latest --datastore_host localhost
 	go test -cover -count=1 -v ./pkg/rid/store/sqlstore --datastore_host localhost --datastore_port 26257 --datastore_ssl_mode disable --datastore_user root -test.gocoverdir=$(COVERDATA_DIR)
-	go test -cover -count=1 -v ./pkg/rid/application --datastore_host localhost --datastore_port 26257 --datastore_ssl_mode disable --datastore_user root -test.gocoverdir=$(COVERDATA_DIR)
 	go test -cover -count=1 -v ./pkg/scd/store/sqlstore --datastore_host localhost --datastore_port 26257 --datastore_ssl_mode disable --datastore_user root -test.gocoverdir=$(COVERDATA_DIR)
 	go test -cover -count=1 -v ./pkg/aux_/store/sqlstore --datastore_host localhost --datastore_port 26257 --datastore_ssl_mode disable --datastore_user root -test.gocoverdir=$(COVERDATA_DIR)
 	@docker stop dss-crdb-for-testing > /dev/null

build/dev/docker-compose_dss.yaml

@@ -111,6 +111,7 @@ services:
       - $PWD/../test-certs:/var/test-certs:ro
       - $PWD/startup/core_service.sh:/startup/core_service.sh:ro
       - $PWD/startup/coverdata:/startup/coverdata:rw  # we will save coverage info here
+      - raftdata:/raftdata
     environment:
       COMPOSE_PROFILES: ${COMPOSE_PROFILES}
       # Note: requires the Dockerfile to have been built with "-cover" in the EXTRA_GO_INSTALL_FLAGS var
@@ -147,7 +148,7 @@ services:
       interval: 3m
       start_period: 30s
       start_interval: 5s
-    profiles: ["", "with-yugabyte", "with-monitoring"]
+    profiles: ["", "with-yugabyte", "with-monitoring", "with-raft"]
 
   local-dss-dummy-oauth:
     build:
@@ -216,3 +217,4 @@ networks:
 
 volumes:
   local-dss-data:
+  raftdata:

build/dev/startup/core_service.sh

@@ -10,8 +10,13 @@ if [ "${COMPOSE_PROFILES#*"with-yugabyte"}" != "${COMPOSE_PROFILES}" ]; then
   echo "Using Yugabyte"
   DATASTORE_CONNECTION="-datastore_host local-dss-ybdb -datastore_user yugabyte --datastore_port 5433"
 else
-  echo "Using CockroachDB"
-  DATASTORE_CONNECTION="-datastore_host local-dss-crdb"
+    if [ "${COMPOSE_PROFILES#*"with-raft"}" != "${COMPOSE_PROFILES}" ]; then
+      echo "Using raft"
+      DATASTORE_CONNECTION="-store_type raft -raft_node_id=1 -rid_raft_peers=1=http://127.0.0.1:9011 -scd_raft_peers=1=http://127.0.0.1:9021 -aux_raft_peers=1=http://127.0.0.1:9031 -raft_datadir /raftdata"
+    else
+      echo "Using CockroachDB"
+      DATASTORE_CONNECTION="-datastore_host local-dss-crdb"
+    fi
 fi
 
 if [ "${COMPOSE_PROFILES#*"with-monitoring"}" != "${COMPOSE_PROFILES}" ]; then

cmds/core-service/main.go

@@ -27,7 +27,6 @@ import (
 	requestlocality "github.com/interuss/dss/pkg/locality"
 	"github.com/interuss/dss/pkg/logging"
 	"github.com/interuss/dss/pkg/random"
-	"github.com/interuss/dss/pkg/rid/application"
 	rid_v1 "github.com/interuss/dss/pkg/rid/server/v1"
 	rid_v2 "github.com/interuss/dss/pkg/rid/server/v2"
 	rids "github.com/interuss/dss/pkg/rid/store"
@@ -112,6 +111,15 @@ func createAuxServer(ctx context.Context, locality string, publicEndpoint string
 		return nil, stacktrace.Propagate(err, "Unable to interact with store")
 	}
 
+	ctx = timestamp.NewContext(ctx, time.Now())
+
+	seed, err := random.NewSeed()
+	if err != nil {
+		return nil, stacktrace.Propagate(err, "Unable to generate seed")
+	}
+
+	ctx = random.NewContext(ctx, seed)
+
 	err = repo.SaveOwnMetadata(ctx, locality, publicEndpoint)
 
 	if err != nil {
@@ -141,15 +149,12 @@ func createRIDServers(ctx context.Context, locality string, logger *zap.Logger)
 		}
 	}
 
-	app := application.NewFromTransactor(ridStore, logger)
 	return &rid_v1.Server{
 			Store:             ridStore,
-			App:               app,
 			Locality:          locality,
 			AllowHTTPBaseUrls: *allowHTTPBaseUrls,
 		}, &rid_v2.Server{
 			Store:             ridStore,
-			App:               app,
 			Locality:          locality,
 			AllowHTTPBaseUrls: *allowHTTPBaseUrls,
 		}, nil
@@ -368,9 +373,9 @@ func RunHTTPServer(ctx context.Context, ctxCanceler func(), address, locality st
 	handler = authorizer.TokenMiddleware(handler)
 	handler = http.TimeoutHandler(handler, *timeout, "request timeout")
 	handler = logging.HTTPMiddleware(logger, *dumpRequests, handler)
-	handler = timestamp.RequestTimestampMiddleware(handler)
+	handler = timestamp.Middleware(handler)
 	handler = random.Middleware(handler)
-	handler = requestlocality.LocalityMiddleware(locality)(handler)
+	handler = requestlocality.Middleware(locality)(handler)
 
 	if *enableMetrics || *enableTracing {
 		// We use the default settings; the APIRouter handler will override the span value accordingly, as it has more information.

cmds/dummy-oauth/api/dummyoauth/interface.gen.go

@@ -30,7 +30,7 @@ type GetTokenRequest struct {
 	Auth api.AuthorizationResult
 }
 
-const GetTokenOperationID = "GetToken"
+const GetTokenOperationID = "dummyoauth.GetToken"
 
 func (request *GetTokenRequest) OperationID() string { return GetTokenOperationID }
 

interfaces/openapi-to-go-server/example/api/rid/interface.gen.go

@@ -78,7 +78,7 @@ type SearchIdentificationServiceAreasRequest struct {
 	Auth api.AuthorizationResult
 }
 
-const SearchIdentificationServiceAreasOperationID = "SearchIdentificationServiceAreas"
+const SearchIdentificationServiceAreasOperationID = "rid.SearchIdentificationServiceAreas"
 
 func (request *SearchIdentificationServiceAreasRequest) OperationID() string {
 	return SearchIdentificationServiceAreasOperationID
@@ -112,7 +112,7 @@ type GetIdentificationServiceAreaRequest struct {
 	Auth api.AuthorizationResult
 }
 
-const GetIdentificationServiceAreaOperationID = "GetIdentificationServiceArea"
+const GetIdentificationServiceAreaOperationID = "rid.GetIdentificationServiceArea"
 
 func (request *GetIdentificationServiceAreaRequest) OperationID() string {
 	return GetIdentificationServiceAreaOperationID
@@ -152,7 +152,7 @@ type CreateIdentificationServiceAreaRequest struct {
 	Auth api.AuthorizationResult
 }
 
-const CreateIdentificationServiceAreaOperationID = "CreateIdentificationServiceArea"
+const CreateIdentificationServiceAreaOperationID = "rid.CreateIdentificationServiceArea"
 
 func (request *CreateIdentificationServiceAreaRequest) OperationID() string {
 	return CreateIdentificationServiceAreaOperationID
@@ -200,7 +200,7 @@ type UpdateIdentificationServiceAreaRequest struct {
 	Auth api.AuthorizationResult
 }
 
-const UpdateIdentificationServiceAreaOperationID = "UpdateIdentificationServiceArea"
+const UpdateIdentificationServiceAreaOperationID = "rid.UpdateIdentificationServiceArea"
 
 func (request *UpdateIdentificationServiceAreaRequest) OperationID() string {
 	return UpdateIdentificationServiceAreaOperationID
@@ -242,7 +242,7 @@ type DeleteIdentificationServiceAreaRequest struct {
 	Auth api.AuthorizationResult
 }
 
-const DeleteIdentificationServiceAreaOperationID = "DeleteIdentificationServiceArea"
+const DeleteIdentificationServiceAreaOperationID = "rid.DeleteIdentificationServiceArea"
 
 func (request *DeleteIdentificationServiceAreaRequest) OperationID() string {
 	return DeleteIdentificationServiceAreaOperationID
@@ -281,7 +281,7 @@ type SearchSubscriptionsRequest struct {
 	Auth api.AuthorizationResult
 }
 
-const SearchSubscriptionsOperationID = "SearchSubscriptions"
+const SearchSubscriptionsOperationID = "rid.SearchSubscriptions"
 
 func (request *SearchSubscriptionsRequest) OperationID() string {
 	return SearchSubscriptionsOperationID
@@ -315,7 +315,7 @@ type GetSubscriptionRequest struct {
 	Auth api.AuthorizationResult
 }
 
-const GetSubscriptionOperationID = "GetSubscription"
+const GetSubscriptionOperationID = "rid.GetSubscription"
 
 func (request *GetSubscriptionRequest) OperationID() string { return GetSubscriptionOperationID }
 
@@ -353,7 +353,7 @@ type CreateSubscriptionRequest struct {
 	Auth api.AuthorizationResult
 }
 
-const CreateSubscriptionOperationID = "CreateSubscription"
+const CreateSubscriptionOperationID = "rid.CreateSubscription"
 
 func (request *CreateSubscriptionRequest) OperationID() string { return CreateSubscriptionOperationID }
 
@@ -400,7 +400,7 @@ type UpdateSubscriptionRequest struct {
 	Auth api.AuthorizationResult
 }
 
-const UpdateSubscriptionOperationID = "UpdateSubscription"
+const UpdateSubscriptionOperationID = "rid.UpdateSubscription"
 
 func (request *UpdateSubscriptionRequest) OperationID() string { return UpdateSubscriptionOperationID }
 
@@ -441,7 +441,7 @@ type DeleteSubscriptionRequest struct {
 	Auth api.AuthorizationResult
 }
 
-const DeleteSubscriptionOperationID = "DeleteSubscription"
+const DeleteSubscriptionOperationID = "rid.DeleteSubscription"
 
 func (request *DeleteSubscriptionRequest) OperationID() string { return DeleteSubscriptionOperationID }