add videoapi grpc server and vidit tool

.github/workflows/golangci-lint.yml

@@ -15,11 +15,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
-          cache: false
+          go-version-file: go.mod
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.55.2
+          version: v1.58.1

.github/workflows/statictest.yml

@@ -9,10 +9,10 @@ on:
 jobs:
   statictest:
     runs-on: ubuntu-latest
-    container: golang:1.21
+    container: golang:1.22
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Download statictest binary
         uses: robinraju/[email protected]

.gitignore

@@ -23,6 +23,19 @@ report.xml
 profile.cov
 coverage.html
 
+# macos stuff
 .DS_Store
 
-output
+# test paths
+output/
+cmd/vidictl/test.go
+docker/compose/config/test.xml
+
+# certs
+docker/compose/tls/*
+!docker/compose/tls/placeholder
+
+e2e/cert.pem
+e2e/key.pem
+
+dist/

.golangci.yml

@@ -1,26 +1,15 @@
 # Options for analysis running.
 run:
-  go: "1.21"
+  go: "1.22"
   # Settable parameters #
   timeout: 5m
   tests: true
   build-tags: []
-  # Which dirs to skip: issues from them won't be reported.
-  skip-dirs:
-    - "bin"
-    - "scripts"
-    - ".ci"
-    - ".gradle"
-  # Which files to skip: they will be analyzed, but issues from them won't be reported.
-  skip-files: []
 
   # Invariable parameters #
 
   # Exit code when at least one issue was found.
   issues-exit-code: 1
-  # Enables skipping of directories:
-  # - vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
-  skip-dirs-use-default: false
   # If set we pass it to "go list -mod={option}". From "go help modules":
   # If invoked with -mod=readonly, the go command is disallowed from the implicit
   # automatic updating of go.mod described above. Instead, it fails when any changes
@@ -43,7 +32,8 @@ run:
 
 # Output configuration options
 output:
-  format: colored-line-number
+  formats:
+    - format: colored-line-number
   # Print lines of code with issue.
   print-issued-lines: true
   # Print linter name in the end of issue text.
@@ -100,43 +90,11 @@ linters-settings:
 
   gocritic:
     enabled-checks:
-      - appendAssign
       - appendCombine
-      - argOrder
-      - assignOp
-      - badCall
-      - badCond
-      - captLocal
-      - caseOrder
-      - commentFormatting
-      - defaultCaseOrder
-      - deprecatedComment
-      - dupArg
-      - dupBranchBody
-      - dupCase
-      - dupSubExpr
-      - elseif
-      - exitAfterDefer
-      - flagDeref
-      - flagName
-      - ifElseChain
       - indexAlloc
-      - mapKey
-      - newDeref
-      - offBy1
       - rangeExprCopy
       - rangeValCopy
-      - regexpMust
-      - singleCaseSwitch
-      - sloppyLen
       - stringXbytes
-      - switchTrue
-      - typeSwitchVar
-      - underef
-      - unlambda
-      - unslice
-      - valSwap
-      - wrapperFunc
 
   godot:
     capital: true
@@ -150,7 +108,7 @@ linters-settings:
   goimports:
     local-prefixes: github.com/org/project
 
-  gomnd:
+  mnd:
     checks:
       - argument
       - case
@@ -372,15 +330,14 @@ linters:
     - errcheck
     - errname
     - errorlint
-    - execinquery
     - exhaustive
     - gocheckcompilerdirectives
     - goconst
     - gocritic
     - godot
     - gofmt
     - goimports
-    - gomnd
+    - mnd
     - goprintffuncname
     - gosec
     - gosimple
@@ -418,8 +375,16 @@ linters:
 
 # Issues configuration
 issues:
+  exclude-dirs:
+    - "bin"
+    - "scripts"
+    - ".ci"
+    - ".gradle"
   exclude: []
   exclude-case-sensitive: false
+  # Enables skipping of directories:
+  # - vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
+  exclude-dirs-use-default: false
   exclude-rules:
     - path: "_test\\.go"
       text: "fieldalignment: struct with \\d+ pointer bytes could be \\d+"

.goreleaser.yaml

@@ -0,0 +1,34 @@
+version: 1
+
+before:
+  hooks:
+    - go mod tidy
+
+builds:
+  - env:
+      - CGO_ENABLED=0
+    main: ./cmd/vidit
+    binary: vidit
+    tags:
+      - netgo
+    goos:
+      - darwin
+      - linux
+      - windows
+    goarch:
+      - "386"
+      - amd64
+      - arm64
+
+archives:
+  - format: tar.gz
+    name_template: >-
+      {{- .ProjectName -}}
+      {{- title .Os }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else if eq .Arch "386" }}i386
+      {{- else }}{{ .Arch }}{{ end }}
+      {{- if .Arm }}v{{ .Arm }}{{ end }}
+    format_overrides:
+      - goos: windows
+        format: zip

.mockery.yml

@@ -9,3 +9,4 @@ packages:
   github.com/adwski/vidi/internal/api/video:
     interfaces:
       Store: {}
+      SessionStore: {}

Makefile

@@ -1,3 +1,5 @@
+SHELL := /bin/bash
+
 .PHONY: mock
 mock:
 	find . -type f -name "mock_*" -exec rm -rf {} +
@@ -9,21 +11,30 @@ docker-dev:
 	docker compose up -d
 	docker ps
 
+.PHONY: docker-infra
 docker-infra:
 	cd docker/compose ;\
-	docker compose -f docker-compose.infra.yml up -d
+	docker compose -f docker-compose.infra.yml -f docker-compose.nginx.yml up -d
 	docker ps
 
+.PHONY: docker-infra-clean
 docker-infra-clean:
 	cd docker/compose ;\
-	docker compose -f docker-compose.infra.yml down -v
+	docker compose -f docker-compose.infra.yml -f docker-compose.nginx.yml down -v
 	docker ps
 
+.PHONY: docker-dev-build
 docker-dev-build:
 	cd docker/compose ;\
 	docker compose up -d --build
 	docker ps
 
+.PHONY: docker-dev-build-svc
+docker-dev-build-svc:
+	cd docker/compose ;\
+	docker compose up -d --no-deps --build $$SVC
+	docker ps
+
 .PHONY: docker-dev-clean
 docker-dev-clean:
 	cd docker/compose ;\
@@ -37,16 +48,19 @@ goimports:
 lint:
 	golangci-lint run ./...
 
-.PHONY: build
-build:
-	go build -gcflags "-m" -race -o ./cmd/userapi/userapi ./cmd/userapi/*.go
+build-tui:
+	goreleaser build --debug --clean
 
 .PHONY: statictest
 statictest:
 	go vet -vettool=$$(which statictest) ./...
 
+.PHONY: test-nginx
 test-nginx:
-	docker run --rm -it --entrypoint nginx -v ./docker/compose/nginx.conf:/etc/nginx/nginx.conf nginx:1.25.3-bookworm -t
+	docker run --rm -it --entrypoint nginx \
+		-v ./docker/compose/tls:/etc/nginx/tls \
+		-v ./docker/compose/nginx.conf:/etc/nginx/nginx.conf \
+		nginx:1.25.3-bookworm -t
 
 .PHONY: unittests
 unittests:
@@ -56,10 +70,27 @@ unittests:
 cover:
 	go tool cover -html profile.cov -o coverage.html
 
-
 .PHONY: test-all
 test-all: docker-infra
 	go test -v -count=1 -cover -coverpkg=./... -coverprofile=profile.cov --tags e2e ./...
 	go tool cover -func profile.cov
 	$(MAKE) cover
 	$(MAKE) docker-infra-clean
+
+.PHONY: grpc
+grpc:
+	protoc --go_out=.  --go-grpc_out=.  internal/api/video/grpc/protobuf/user.proto
+	protoc --go_out=.  --go-grpc_out=.  internal/api/video/grpc/protobuf/service.proto
+
+.PHONY: tls
+tls:
+	openssl req -x509 -nodes -days 365 -newkey rsa:4096 \
+	-keyout ./docker/compose/tls/key.pem -out ./docker/compose/tls/cert.pem \
+	-subj "/C=RU/O=ViDi/OU=vidi/CN=vidi" \
+		-addext "subjectAltName = DNS:localhost, IP:127.0.0.1, IP:::1"
+
+	VIDI_CA=$$(base64 -i ./docker/compose/tls/cert.pem) && \
+		tmp=$$(mktemp) &&  \
+		cfg="./docker/compose/config/config.json"  && \
+		jq --arg a "$$VIDI_CA" '.vidi_ca = $$a' $$cfg > $$tmp && \
+		mv $$tmp $$cfg

README.md

@@ -1,6 +1,6 @@
 ## Vidi
 
-![Coverage](https://img.shields.io/badge/Coverage-80.4%25-brightgreen)
+![Coverage](https://img.shields.io/badge/Coverage-70.9%25-brightgreen)
 
 WIP
 

cmd/vidictl/vidi.go

@@ -0,0 +1,11 @@
+package main
+
+import (
+	"os"
+
+	"github.com/adwski/vidi/internal/cli"
+)
+
+func main() {
+	os.Exit(cli.Execute())
+}

cmd/vidit/main.go

@@ -0,0 +1,16 @@
+package main
+
+import (
+	"log"
+	"os"
+
+	"github.com/adwski/vidi/internal/tool"
+)
+
+func main() {
+	t, err := tool.New()
+	if err != nil {
+		log.Fatal(err)
+	}
+	os.Exit(t.Run())
+}

docker/compose/config/config.json

@@ -0,0 +1,5 @@
+{
+  "user_api_url": "http://localhost/api/users",
+  "video_api_url": "localhost:443",
+  "vidi_ca": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZoRENDQTJ5Z0F3SUJBZ0lVWTNSZmo0V1I3VkNwUEREZ2liR1Q0V1RySzlBd0RRWUpLb1pJaHZjTkFRRUwKQlFBd09qRUxNQWtHQTFVRUJoTUNVbFV4RFRBTEJnTlZCQW9NQkZacFJHa3hEVEFMQmdOVkJBc01CSFpwWkdreApEVEFMQmdOVkJBTU1CSFpwWkdrd0hoY05NalF3TlRFeE1qRXhOekEzV2hjTk1qVXdOVEV4TWpFeE56QTNXakE2Ck1Rc3dDUVlEVlFRR0V3SlNWVEVOTUFzR0ExVUVDZ3dFVm1sRWFURU5NQXNHQTFVRUN3d0VkbWxrYVRFTk1Bc0cKQTFVRUF3d0VkbWxrYVRDQ0FpSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnSVBBRENDQWdvQ2dnSUJBTGFOdjVPSgp6WmpYWGZ4enhaYWI3L2FJMjZkMWc4TEp1Y0R5SnpQY2JvUDdCSnh5RHFsUXAxT0RGZ2N0S2JmUWY4QlJnZG1oCjBKVFdJd0dyaWNwN2FJOEprd2lvQXZWRmZaOTNtTElCQUc1Zjc5RVp3Y0YyZnllSjNQOG5WdU5FRDVSclR2Z3EKaUNidU5EdkJQMG5uUEhWeDhDYnU1WFpyaGJVV2xZTjkvQW1kb0dFRTJXSlpVb2NJdGxKQnF3bmkzWVpaekxKZQpPZFV6Z00rY2loYjljV3N5OXBvMkZ0V0Z6YnRySnNCaXhLRElUNk9IYTFLTHdoS0RSUFJLSnNmNTNSQ3EvVUlJCkRVM2I1WGx1UFFvQVJvaHl0bzhYdDNDYkgxYWJtRStneUN4QzR6czVsL2dlRVU5N2FQKzRJQ1JlVGFMemdFckUKN21Nakd2NWFQTTFxYVc2MFZyaUwxMUs4ajlwMGpJeDdkRnBpeVZ5S1g1allCVG8zWXBKdTZIc2lldS92MEZyNQo4czdDcmQ2NlFxNmRXR2lpdlV3VXhlNVF5WVJYdkZxQ2hEOERvRHJadGE0UXpQaXhMcldaSjNhU0UwS1JJYyszCi8weE4rYVZhMXQwU0pNMXNJMkMyRVd5ZmtMVWNqcUpLaDNaY0RidHBsUFQ4OXEwV1VEOUVJVXNlU0xtVER4QXIKMURLaEdKaWxhcjUweG1GOVFxYkgrTHFNWWl6V1lPVTBqRUtlSWpsN1RuT2xXSy9WNC9BMDBvL0NnamNCcnVyRgprVS92bTNFbGpYeXNmMlh5UVFmbFdISExVN3hWSElUYmhucGFObXFDaENnQVRFTzhUemlpem1EMEp3TkFRTld1CmdpV3Q0SEVZbDJUdEFRdXdaaEJTNUdmbllBMld2VlQ2ZEs4MUFnTUJBQUdqZ1lFd2Z6QWRCZ05WSFE0RUZnUVUKTmQ5WWlHa0RZVlB2T2JNOEx6UGFOQjY5aDZvd0h3WURWUjBqQkJnd0ZvQVVOZDlZaUdrRFlWUHZPYk04THpQYQpOQjY5aDZvd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBc0JnTlZIUkVFSlRBamdnbHNiMk5oYkdodmMzU0hCSDhBCkFBR0hFQUFBQUFBQUFBQUFBQUFBQUFBQUFBRXdEUVlKS29aSWh2Y05BUUVMQlFBRGdnSUJBSHZOY2lReDd5dWoKUlBqelk0Y2c0dGtKbkNoZjFGcHJWbThYbC9GL1FteC9KK0JOWjNyTm5ZdWVFN1ZXSUV5bzdRQ3Y4NjI4TTF4MwpnRy9iODRSOFJ6ajhWeXhXZWpCdnZpTGNIZW5VZUJTbnVmS2JOUlBnRmFlSWk1L1k3akQ3Qk9vVDAzdzJUUGZYCmZUbG5IRTE5ZndvaDFuUFFRZXJEazhuSFVnZmdhUHIzWXNOWkdPL0MrbmFtcytoTGp4R0dEcWJPa1psQW8wU2YKaCtxQ3h4dVdwT3VJODBLajNOVVc5L0kwTERtTFRzeHBXcGxmT25ibm9RbmUyYXZLdEtadkxHa05vVDFZMTd0bQpSRFRERGhtYTBaTytTaTk0dlF6ZXhWUUg0QnBOd3QydDZnTVRHTW0yRTRBS0FFc2FXWHZ0Y0dPaGhudjJ5NzkyCjJUa3A3aEZmZEFjWlk2bDVpZjZHZGxtU1gwdUVFcWV4ZjRuNjJvaHF1bVp3aVZldHVEUndaMitnSEFwdGwyeG0KekNOUHZOSEY3emxpRGo2VE9OWXoxV0w0NGViNldGbTV6YThlTU4xNFNwd01mUTBRUTV4MjUwOCttNW4yM2JJZApmaUVnVytORTUzLzV5c2wyeWpVSGtiUWhpY1hqZVlsei9sNk9jRVFDN2pGaHVwcmZaWmR2Yzd1QWFJczBINER2CjdYOXdvRlh5OXNzUUwwZk1nemdIQ2M5VmQ4TDlabWNWazBhV3RncWxiRERYM2wreVFHUjBnNW5pcnhDUGZZNC8KWEF2R2p4ZFllcnBxNGFmNkNIeHRCZkdMaGszZnYwbmM4REtDRnZUZUhHTC9SbmkzZnB3SURHN2dTcUZaOFBtVQpTQStKN0Y0UUlNaVNrLy9JYUxlWThBdnRDUG1RY3VsZgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg=="
+}

docker/compose/docker-compose.api.yml

@@ -1,6 +1,4 @@
 ---
-version: "3.8"
-
 x-logging: &logging
   driver: "json-file"
   options:
@@ -18,7 +16,7 @@ services:
     environment:
       VIDI_API_PREFIX: /api/users
       VIDI_DATABASE_DSN: postgres://userapi:userapi@postgres:5432/userapi?sslmode=disable
-      VIDI_SERVER_ADDRESS: ":8080"
+      VIDI_SERVER_HTTP_ADDRESS: ":8080"
     expose:
       - 8080
     networks:
@@ -34,14 +32,18 @@ services:
       dockerfile: docker/videoapi.Dockerfile
       target: dev
     environment:
-      VIDI_API_PREFIX: /api/video
+      VIDI_API_PREFIX: /api
       VIDI_DATABASE_DSN: postgres://videoapi:videoapi@postgres:5432/videoapi?sslmode=disable
       VIDI_REDIS_DSN: redis://redis:6379/0
-      VIDI_MEDIA_URL_WATCH: http://localhost:8080/watch
-      VIDI_MEDIA_URL_UPLOAD: http://localhost:8080/upload
-      VIDI_SERVER_ADDRESS: ":8080"
+      VIDI_MEDIA_URL_WATCH: http://localhost:80/watch
+      VIDI_MEDIA_URL_UPLOAD: http://localhost:80/upload
+      VIDI_SERVER_HTTP_ADDRESS: ":8080"
+      VIDI_SERVER_GRPC_ADDRESS: ":8181"
+      VIDI_SERVER_GRPC_SVC_ADDRESS: ":8282"
     expose:
       - 8080
+    ports:
+      - "8282:8282"
     networks:
       - vidi
     depends_on: