Dev (#289)

* row action menu exmaple

* operation authorization helper

* css

* traefikless setup for oidc - useful for broken wsl2 with wifi + acrylic dns setups

* dont fix via golangci-lint

* refactor mrt custom filters

* css and refactoring

* date input

* proper components

* fix oapi template gen

* notes to fix oapi-codegen mapping gen upstream

* fix oapi codegen upstream

* orval also broken for shared schemas

* orval update

* update filters

* add filter tests

* filter tests

* refactor filter tests

* update filter tests

* squash migrations due to slow golang-migrate

* null filters

* update pagination and filters representation

* update tests

Author: danicc097

.env.ci

@@ -23,6 +23,7 @@ FRONTEND_PORT=80
 OIDC_CLIENT_ID=web
 OIDC_CLIENT_SECRET=secret
 AUTH_SERVER_UI_PROFILE="https://authserver.local.localhost/oidc/profile"
+MOCK_OIDC_SERVER_PATH_PREFIX="/oidc"
 OIDC_DOMAIN="authserver.local.localhost"
 OIDC_ISSUER="https://authserver.local.localhost/oidc"
 OIDC_SCOPES="openid profile email auth"

.env.template

@@ -20,12 +20,19 @@ REDIS_HOST=
 REDIS_DB=
 API_PORT=
 FRONTEND_PORT=
+# for traefikless setup:
+# AUTH_SERVER_UI_PROFILE="http://localhost:$MOCK_OIDC_SERVER_PORT/profile"
+# OIDC_DOMAIN="localhost:$MOCK_OIDC_SERVER_PORT"
+# OIDC_ISSUER="http://localhost:$MOCK_OIDC_SERVER_PORT"
 AUTH_SERVER_UI_PROFILE=
-OIDC_CLIENT_ID=
-OIDC_CLIENT_SECRET=
+OIDC_DOMAIN=
 OIDC_ISSUER=
 OIDC_SCOPES=
-OIDC_DOMAIN=
+OIDC_CLIENT_ID=
+OIDC_CLIENT_SECRET=
+# if using localhost:$MOCK_OIDC_SERVER_PORT, then leave empty,
+# else set to traefik label's PathPrefix
+MOCK_OIDC_SERVER_PATH_PREFIX=
 MOCK_OIDC_SERVER_PORT=
 MOCK_OIDC_SERVER_DATA_DIR=
 SIGNING_KEY=

.vscode/settings.json

@@ -4,7 +4,8 @@
   "go.lintFlags": [
     "--config=${workspaceFolder}/.golangci.yml",
     "--issues-exit-code=0",
-    "--fix",
+    // golangci possibly broke generated code skipping in recent releases
+    // "--fix",
     "--fast" // breaks some linters like errcheck, if its too slow then enable back
   ],
   "go.lintOnSave": "package",

bin/project

@@ -851,9 +851,9 @@ x.gen.client-server() {
     # yq e 'del(.components)' -i "$paths_file" # dont delete since recent oapi-codegen does some checks even if we are not generating types
     go build -o $BUILD_DIR/oapi-codegen cmd/oapi-codegen/main.go || mark_failed_tool_build # templates are embedded, required rebuild
 
-    oapi-codegen --config internal/models/oapi-codegen-types.yaml "$SPEC_PATH" || err "Failed types generation" &
-    oapi-codegen --config internal/rest/oapi-codegen-server.yaml --models-pkg models --server-types "$server_types_list" --types "$types_list" "$paths_file" || err "Failed server generation" &
-    oapi-codegen --config internal/rest/oapi-codegen-test-client.yaml "$SPEC_PATH" || err "Failed client generation" &
+    oapi-codegen --config internal/models/oapi-codegen-types.yaml "$SPEC_PATH" || err "Failed types generation"
+    oapi-codegen --config internal/rest/oapi-codegen-server.yaml --models-pkg models --server-types "$server_types_list" --types "$types_list" "$paths_file" || err "Failed server generation"
+    oapi-codegen --config internal/rest/oapi-codegen-test-client.yaml "$SPEC_PATH" || err "Failed client generation"
     # not used now. may be useful for a cli at some point
     # oapi-codegen --config internal/client/oapi-codegen-client.yaml "$SPEC_PATH" || err "Failed client generation" &
 
@@ -1128,7 +1128,8 @@ x.lint.go() {
     -name "*.go")
   goimports -w $files || err "Linting failed"
   gofumpt -w $files || err "Linting failed"
-  golangci-lint run --config=.golangci.yml --allow-parallel-runners --fast --fix &>/dev/null || true
+  # recent releases possibly broke generated code detection
+  # golangci-lint run --config=.golangci.yml --allow-parallel-runners --fast --fix &>/dev/null || true
 }
 
 exhaustruct_lint() {
@@ -1225,7 +1226,7 @@ x.test.backend.setup() {
   { { {
     # NOTE: tests run independently in Go so we can't have a function be called and run
     # only once before any test starts
-    run_shared_services up -d --build --remove-orphans --wait
+    run_shared_services up -d --build --remove-orphans --force-recreate --wait
     x.gen
     # no need to migrate, done on every test run internally
     docker.postgres.drop_and_recreate_db $POSTGRES_TEST_DB
@@ -1384,8 +1385,13 @@ x.test.backend.watch-for() {
 
   test_backend_watch -run "^($fns)$" "$GOMOD_PKG/$dir" "${gotest_args[@]}"
 }
+
+pre_build_cmd="project setup-swagger-ui"
+
 # Run backend.
 x.run.backend() {
+  $pre_build_cmd
+  run_shared_services up -d --build --remove-orphans --force-recreate --wait
   go run ./cmd/rest-server/main.go -env=.env.$X_ENV
 }
 
@@ -1394,11 +1400,10 @@ x.run.backend-hr() {
   # TODO replace healthcheck with adhoc calls and bring services up in btaches
   # to prevent either bombarding with req or having to wait too long at startup.
   # see https://github.com/moby/moby/issues/33410
-  run_shared_services up -d --build --remove-orphans --wait
+  run_shared_services up -d --build --remove-orphans --force-recreate --wait
 
   # https://github.com/cosmtrek/air/blob/master/air_example.toml
   # NOTE: building binary unreliable, leads to bin not found.
-  local pre_build_cmd="project setup-swagger-ui"
   air \
     --build.pre_cmd "$pre_build_cmd" \
     --build.cmd "" \

cmd/oapi-codegen/oapi-templates/union.tmpl

@@ -4,10 +4,7 @@
     {{$properties := .Schema.Properties -}}
     {{range .Schema.UnionElements}}
         {{ $element := printf "%v" . -}}
-        {{ $name := $element -}}
-        {{ if (is_rest_type $element) -}}
-        {{ $name = (printf "%v" (rest_type $element)) -}}
-        {{ end -}}
+        {{ $name := (printf "%v" (rest_type $element)) -}}
         // As{{$name}} returns the union data inside the {{$typeName}} as a {{$name}}
         func (t {{$typeName}}) As{{$name}}() ({{$name}}, error) {
             var body {{$name}}
@@ -74,7 +71,7 @@
             return discriminator.Discriminator, err
         }
         {{/* TODO: can use is_rest_type here too. */}}
-        {{if ne 0 (len $discriminator.Mapping)}}
+        {{ if ne 0 (len $discriminator.Mapping)}}
             func (t {{.TypeName}}) ValueByDiscriminator() (interface{}, error) {
                 discriminator, err := t.Discriminator()
                 if err != nil {

db/migrations/0000002_init.down.sql

@@ -2,6 +2,8 @@ drop schema if exists v;
 
 drop schema if exists "cache";
 
+drop schema if exists extra_schema cascade;
+
 do $$
 declare
   table_rec RECORD;