cleanup

Author: metachris

Makefile

@@ -123,7 +123,7 @@ db-dump: ## Dump the database contents to file 'database.dump'
 .PHONY: dev-db-setup
 dev-db-setup: ## Create the basic database entries for testing and development
 	@printf "$(BLUE)Create the allow-all measurements $(NC)\n"
-	$(CURL) $(CURL_AUTH) --request POST --url http://localhost:8081/api/admin/v1/measurements --data '{"measurement_id": "test1","attestation_type": "test","measurements": {"11": {"expected": "efa43e0beff151b0f251c4abf48152382b1452b4414dbd737b4127de05ca31f7"}}}'
+	$(CURL) $(CURL_AUTH) --request POST --url http://localhost:8081/api/admin/v1/measurements --data '{"measurement_id": "test1","attestation_type": "test","measurements": {}}'
 
 	@printf "$(BLUE)Enable the measurements $(NC)\n"
 	$(CURL) $(CURL_AUTH) --request POST --url http://localhost:8081/api/admin/v1/measurements/activation/test1 --data '{"enabled": true}'

README.md

@@ -51,7 +51,7 @@ curl -u admin:secret http://localhost:8081/api/admin/v1/measurements
 
 Local development only: you can disable Admin API auth with `--disable-admin-auth` or `DISABLE_ADMIN_AUTH=1`. This is unsafe; never use in production.
 
-For development/testing, you may also allow empty measurements with `--enable-empty-measurements` or `ENABLE_EMPTY_MEASUREMENTS=1`. In production, keep this disabled and specify at least one expected measurement.
+For development/testing, you may also allow empty measurements with `--allow-empty-measurements` or `ALLOW_EMPTY_MEASUREMENTS=1`. In production, keep this disabled and specify at least one expected measurement.
 
 ### Manual setup
 

cmd/httpserver/main.go

@@ -114,9 +114,9 @@ var flags = []cli.Flag{
 		EnvVars: []string{"MOCK_SECRETS"},
 	},
 	&cli.BoolFlag{
-		Name:    "enable-empty-measurements",
+		Name:    "allow-empty-measurements",
 		Usage:   "allow empty measurements in AddMeasurement (local development/testing only)",
-		EnvVars: []string{"ENABLE_EMPTY_MEASUREMENTS"},
+		EnvVars: []string{"ALLOW_EMPTY_MEASUREMENTS"},
 	},
 }
 
@@ -146,7 +146,7 @@ func runCli(cCtx *cli.Context) error {
 	enablePprof := cCtx.Bool("pprof")
 	drainDuration := time.Duration(cCtx.Int64("drain-seconds")) * time.Second
 	mockSecretsStorage := cCtx.Bool("mock-secrets")
-	enableEmptyMeasurements := cCtx.Bool("enable-empty-measurements")
+	enableEmptyMeasurements := cCtx.Bool("allow-empty-measurements")
 	adminBasicUser := cCtx.String("admin-basic-user")
 	adminPasswordBcrypt := cCtx.String("admin-basic-password-bcrypt")
 	disableAdminAuth := cCtx.Bool("disable-admin-auth")

docker/docker-compose.yaml

@@ -42,7 +42,7 @@ services:
       INTERNAL_ADDR: "0.0.0.0:8082"
       METRICS_ADDR: "0.0.0.0:8090"
       DISABLE_ADMIN_AUTH: "1" # local dev only; do not use in production
-      ENABLE_EMPTY_MEASUREMENTS: "1" # local dev/testing convenience
+      ALLOW_EMPTY_MEASUREMENTS: "1" # local dev/testing convenience
 
   proxy:
     image: flashbots/builder-hub-mock-proxy