Skip to content

TECH-25: add postgres support #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ttt161 merged 4 commits into from
Jun 5, 2025
Merged

TECH-25: add postgres support #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dca6e0c
TECH-25: add postgres support
Jun 2, 2025
f190778
TECH-25: disable codecov
Jun 3, 2025
56785ea
TECH-25: fix issues
Jun 4, 2025
59f1aa5
TECH-25: add vault opts for read postgres creds
Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SERVICE_NAME=cds
OTP_VERSION=24.2.0
REBAR_VERSION=3.18
OTP_VERSION=27.1.2
REBAR_VERSION=3.24
THRIFT_VERSION=0.14.2.2
RIAK_VERSION=ubuntu-2.2.3
7 changes: 5 additions & 2 deletions .github/workflows/erlang-checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
thrift-version: ${{ steps.thrift-version.outputs.version }}
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- run: grep -v '^#' .env >> $GITHUB_ENV
- id: otp-version
run: echo "::set-output name=version::$OTP_VERSION"
Expand All @@ -30,10 +30,13 @@ jobs:
run:
name: Run checks
needs: setup
uses: valitydev/erlang-workflows/.github/workflows/erlang-parallel-build.yml@v1.0.12
uses: valitydev/erlang-workflows/.github/workflows/erlang-parallel-build.yml@v1.0.18
with:
otp-version: ${{ needs.setup.outputs.otp-version }}
rebar-version: ${{ needs.setup.outputs.rebar-version }}
use-thrift: true
thrift-version: ${{ needs.setup.outputs.thrift-version }}
run-ct-with-compose: true
use-coveralls: false
cache-version: v7
upload-coverage: false
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ DEV_IMAGE_TAG = $(TEST_CONTAINER_NAME)-dev
DEV_IMAGE_ID = $(file < .image.dev)

DOCKER ?= docker
DOCKERCOMPOSE ?= docker-compose
DOCKERCOMPOSE ?= docker compose
DOCKERCOMPOSE_W_ENV = DEV_IMAGE_TAG=$(DEV_IMAGE_TAG) $(DOCKERCOMPOSE) -f compose.yaml -f compose.tracing.yaml
REBAR ?= rebar3
TEST_CONTAINER_NAME ?= testrunner
Expand Down
18 changes: 8 additions & 10 deletions apps/cds/src/cds.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,14 @@ enable_health_logging(Check) ->
%%
-spec start(normal, any()) -> {ok, pid()} | {error, any()}.
start(normal, _StartArgs) ->
case supervisor:start_link({local, ?MODULE}, ?MODULE, []) of
{ok, Sup} ->
NSlist = lists:flatten([
cds_token_storage:get_namespaces(),
cds_card_storage:get_namespaces(),
cds_ident_doc_storage:get_namespaces()
]),
cds_storage:start(NSlist),
{ok, Sup}
end.
{ok, Sup} = supervisor:start_link({local, ?MODULE}, ?MODULE, []),
NSlist = lists:flatten([
cds_token_storage:get_namespaces(),
cds_card_storage:get_namespaces(),
cds_ident_doc_storage:get_namespaces()
]),
cds_storage:start(NSlist),
{ok, Sup}.

-spec stop(any()) -> ok.
stop(_State) ->
Expand Down
Loading
Loading