Merge branch 'dev'

Matatika · Feb 15, 2023 · d5e1e86 · d5e1e86
2 parents d3ca859 + 2588ab8
commit d5e1e86
Show file tree

Hide file tree

Showing 47 changed files with 15 additions and 766 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+workspaces/*
+
+!.gitkeep
diff --git a/config/.env.app b/config/.env.app
@@ -0,0 +1,3 @@
+APP_IDENTITY_DOMAIN=${APP_IDENTITY_DOMAIN:-}
+APP_IDENTITY_CLIENT_ID=${APP_IDENTITY_CLIENT_ID:-}
+APP_IDENTITY_CONNECTION=${APP_IDENTITY_CONNECTION:-}
diff --git a/config/.env.catalog b/config/.env.catalog
@@ -0,0 +1,7 @@
+CATALOG_AUTH_IDPS_PRIMARY_ISSUER_URI=${CATALOG_AUTH_IDPS_PRIMARY_ISSUER_URI:-}
+CATALOG_AUTH_IDPS_PRIMARY_JWK_SET_URI=${CATALOG_AUTH_IDPS_PRIMARY_JWK_SET_URI:-}
+CATALOG_AUTH_IDPS_SECONDARY_ISSUER_URI=${CATALOG_AUTH_IDPS_SECONDARY_ISSUER_URI:-}
+CATALOG_AUTH_IDPS_SECONDARY_JWK_SET_URI=${CATALOG_AUTH_IDPS_SECONDARY_JWK_SET_URI:-}
+
+# Generate a 256-bit (32-char) secret key and set it here. This is used to generate access tokens for the Matatika App and API.
+MATATIKA_AUTH_LOCAL_SECRET=${MATATIKA_AUTH_LOCAL_SECRET:-matatikaauthlocalsecret_changeme}
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,6 +13,7 @@ services:
             limits:
               memory: 3g
     tty: true
+    env_file: config/.env.catalog
     environment:
       # Define DEVELOPMENT mode environments like debug settings etc
       - ACTIVE_PROFILES=default,distribution
@@ -25,8 +26,6 @@ services:
       - ELASTICSEARCH_HOST=search
       - MATATIKA_WORKSPACES_HOME=/workspaces
       - MATATIKA_PLUGINS_HOME=file:/plugins
-      # Generate a 256-bit (32-char) secret key and set it here. This is used to generate access tokens for the Matatika App and API.
-      - MATATIKA_AUTH_LOCAL_SECRET=matatikaauthlocalsecret_changeme
     depends_on: {"search-setup": {"condition": "service_completed_successfully"}, "search": {"condition": "service_healthy"}, "db": {"condition": "service_healthy"}}
     healthcheck:
       test: curl -s http://localhost:8080/api/actuator/health | grep "UP" >/dev/null; if [[ $$? == 0 ]]; then echo 0; else echo 1; fi
@@ -44,6 +43,7 @@ services:
       - '3080:80'
       - '3443:443'
     tty: true
+    env_file: config/.env.app
     environment:
       # Define DEVELOPMENT mode environments like debug settings etc
       - REACT_APP_ENV=distribution
@@ -104,7 +104,6 @@ services:
 
   # Short lived container that creates the certificates
   search-createcerts:
-    container_name: search-createcerts
     image: docker.elastic.co/elasticsearch/elasticsearch:7.16.3
     environment:
       - ES_HOME=/usr/share/elasticsearch
@@ -150,7 +149,6 @@ services:
 
   db:
     image: postgres:11
-    container_name: db
     volumes:
       - matatika-catalog_postgres:/var/lib/postgresql/data
     environment:

diff --git a/workspaces/.gitignore b/workspaces/.gitignore
diff --git a/workspaces/project/analyze/.gitkeep → workspaces/.gitkeep b/workspaces/project/analyze/.gitkeep → workspaces/.gitkeep
diff --git a/workspaces/project/.gitignore b/workspaces/project/.gitignore
diff --git a/workspaces/project/README.md b/workspaces/project/README.md
diff --git a/workspaces/project/extract/.gitkeep b/workspaces/project/extract/.gitkeep
diff --git a/workspaces/project/load/.gitkeep b/workspaces/project/load/.gitkeep
diff --git a/workspaces/project/meltano.yml b/workspaces/project/meltano.yml
diff --git a/workspaces/project/notebook/.gitkeep b/workspaces/project/notebook/.gitkeep
diff --git a/workspaces/project/orchestrate/.gitkeep b/workspaces/project/orchestrate/.gitkeep
diff --git a/workspaces/project/output/.gitignore b/workspaces/project/output/.gitignore
diff --git a/workspaces/project/requirements.txt b/workspaces/project/requirements.txt
diff --git a/workspaces/project/transform/.gitkeep b/workspaces/project/transform/.gitkeep
diff --git a/workspaces/project/workspace.yml b/workspaces/project/workspace.yml
diff --git a/workspaces/testrepo-joeiagq/.gitignore b/workspaces/testrepo-joeiagq/.gitignore
diff --git a/workspaces/testrepo-joeiagq/README.md b/workspaces/testrepo-joeiagq/README.md
diff --git a/workspaces/testrepo-joeiagq/analyze/.gitkeep b/workspaces/testrepo-joeiagq/analyze/.gitkeep
diff --git a/workspaces/testrepo-joeiagq/analyze/channels/Github.yml b/workspaces/testrepo-joeiagq/analyze/channels/Github.yml
diff --git a/...aces/testrepo-joeiagq/analyze/datasets/tap-github/github-commits-per-day-last-30-days.yml b/...aces/testrepo-joeiagq/analyze/datasets/tap-github/github-commits-per-day-last-30-days.yml
diff --git a/...o-joeiagq/analyze/datasets/tap-github/github-commits-per-repo-by-month-last-12-months.yml b/...o-joeiagq/analyze/datasets/tap-github/github-commits-per-repo-by-month-last-12-months.yml
diff --git a/workspaces/testrepo-joeiagq/analyze/datasets/tap-github/github-latest-10-issues.yml b/workspaces/testrepo-joeiagq/analyze/datasets/tap-github/github-latest-10-issues.yml
diff --git a/workspaces/testrepo-joeiagq/analyze/datasets/tap-github/github-latest-10-prs.yml b/workspaces/testrepo-joeiagq/analyze/datasets/tap-github/github-latest-10-prs.yml
diff --git a/.../testrepo-joeiagq/analyze/datasets/tap-github/github-total-commits-by-users-last-year.yml b/.../testrepo-joeiagq/analyze/datasets/tap-github/github-total-commits-by-users-last-year.yml
diff --git a/...o-joeiagq/analyze/datasets/tap-github/github-total-commits-per-repo-last-year-to-date.yml b/...o-joeiagq/analyze/datasets/tap-github/github-total-commits-per-repo-last-year-to-date.yml
diff --git a/workspaces/testrepo-joeiagq/analyze/datasets/welcome.yml b/workspaces/testrepo-joeiagq/analyze/datasets/welcome.yml
diff --git a/workspaces/testrepo-joeiagq/extract/.gitkeep b/workspaces/testrepo-joeiagq/extract/.gitkeep
diff --git a/workspaces/testrepo-joeiagq/load/.gitkeep b/workspaces/testrepo-joeiagq/load/.gitkeep