Merge branch 'main' into masv_add-mertric

dc4eu · Mar 22, 2024 · 743ee23 · 743ee23
2 parents e6cc2b0 + 092e20b
commit 743ee23
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 126 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -0,0 +1,33 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/go
+{
+	"name": "Go",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/go:latest",
+	"customizations": {
+		"vscode": {
+			"settings": {
+				"cSpell.language": "en-GB,en,sv"
+			},
+			"extensions": [
+				"GitHub.vscode-pull-request-github",
+				"streetsidesoftware.code-spell-checker",
+				"DavidAnson.vscode-markdownlint",
+				"zenor.makefile-creator",
+				"bungcip.better-toml",
+				"Plex.vscode-protolint",
+				"ms-azuretools.vscode-docker",
+				"zenghongtu.vscode-asciiflow2"
+			]
+		}
+	},
+	"mounts": [
+		"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind",
+		"source=${localEnv:HOME}/work/SUNET/goladok3/,target=/workspaces/goladok3,type=bind,consistency=cached",
+		"source=${localEnv:HOME}/work/SUNET/gosdjwt/,target=/workspaces/gosdjwt,type=bind,consistency=cached",
+		"source=${localEnv:HOME}/work/SUNET/gosunetca/,target=/workspaces/gosunetca,type=bind,consistency=cached",
+		"source=${localEnv:HOME}/work/SUNET/goretask/,target=/workspaces/goretask,type=bind,consistency=cached"
+	],
+	"postCreateCommand": "make vscode",
+	"remoteUser": "vscode"
+}
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
-.devcontainer
 bin/
 pki/*
 !pki/create_pki.sh
-redis-data/
+redis-data/
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -25,6 +25,8 @@
         "otlp",
         "otlptrace",
         "otlptracehttp",
+        "promauto",
+        "promhttp",
         "protobuf",
         "qrcode",
         "rpcclient",

diff --git a/dev_config_docker.yaml b/dev_config_docker.yaml
@@ -1,7 +1,7 @@
 ---
 common:
   mongo:
-    uri: mongodb://user:pw@mongo:27017
+    uri: mongodb://mongo:27017
   production: false
   basic_auth:
     ladok: xyz
@@ -24,6 +24,8 @@ common:
         name: vc_persistent_save
       vc_persistent_get:
         name: vc_persistent_get
+      vc_persistent_delete:
+        name: vc_persistent_delete
   key_value:
     db: 3
     addr: redis:6379

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -2,31 +2,21 @@
 version: "3"
 
 services:
-  issuer:
-    container_name: "vc_issuer"
-    image: docker.sunet.se/dc4eu/issuer:latest
+  apigw:
+    container_name: "vc_apigw"
+    image: docker.sunet.se/dc4eu/apigw:latest
     restart: always
     volumes:
       - ./dev_config_docker.yaml:/config.yaml:ro
-    links:
-      - haproxy
-      - jaeger
+      - /var/log/sunet:/var/log/sunet
     depends_on:
       - redis
       - mongo
-      - datastore
-      - registry
-      - haproxy
-      - jaeger
     networks:
-      - vc-net
+      vc-net:
+        ipv4_address: 172.16.50.2
     environment:
       - "VC_CONFIG_YAML=config.yaml"
-      - "HTTP_PROXY=172.16.50.200"
-      - "http_proxy=172.16.50.200"
-      - "HTTPS_PROXY=172.16.50.200"
-      - "https_proxy=172.16.50.200"
-      - "no_proxy=localhost,127.0.0.0/8,nsqd,nsqlookupd,jaeger"
 
   verifier:
     container_name: "vc_verifier"
@@ -35,30 +25,12 @@ services:
     volumes:
       - ./cert:/cert:ro
       - ./dev_config_docker.yaml:/config.yaml:ro
-    links:
-      - haproxy
     depends_on:
       - redis
       - mongo
-      - haproxy
     networks:
-      - vc-net
-    environment:
-      - "VC_CONFIG_YAML=config.yaml"
-
-  datastore:
-    container_name: "vc_datastore"
-    image: docker.sunet.se/dc4eu/datastore:latest
-    restart: always
-    volumes:
-      - ./dev_config_docker.yaml:/config.yaml:ro
-    links:
-      - haproxy
-    depends_on:
-      - mongo
-      - haproxy
-    networks:
-      - vc-net
+      vc-net:
+        ipv4_address: 172.16.50.3
     environment:
       - "VC_CONFIG_YAML=config.yaml"
 
@@ -68,14 +40,12 @@ services:
     restart: always
     volumes:
       - ./dev_config_docker.yaml:/config.yaml:ro
-    links:
-      - haproxy
     depends_on:
       - redis
       - mongo
-      - haproxy
     networks:
-      - vc-net
+      vc-net:
+        ipv4_address: 172.16.50.4
     environment:
       - "VC_CONFIG_YAML=config.yaml"
 
@@ -85,12 +55,11 @@ services:
     restart: always
     volumes:
       - ./dev_config_docker.yaml:/config.yaml:ro
-    links:
-      - haproxy
     depends_on:
       - redis
     networks:
-      - vc-net
+      vc-net:
+        ipv4_address: 172.16.50.5
     environment:
       - "VC_CONFIG_YAML=config.yaml"
 
@@ -100,30 +69,12 @@ services:
     restart: always
     volumes:
       - ./dev_config_docker.yaml:/config.yaml:ro
-    links:
-      - haproxy
-    depends_on:
-      - redis
-      - mongo
-    networks:
-      - vc-net
-    environment:
-      - "VC_CONFIG_YAML=config.yaml"
-
-  apigw:
-    container_name: "vc_apigw"
-    image: docker.sunet.se/dc4eu/apigw:latest
-    restart: always
-    volumes:
-      - ./dev_config_docker.yaml:/config.yaml:ro
-      - /var/log/sunet:/var/log/sunet
-    links:
-      - haproxy
     depends_on:
       - redis
       - mongo
     networks:
-      - vc-net
+      vc-net:
+        ipv4_address: 172.16.50.6
     environment:
       - "VC_CONFIG_YAML=config.yaml"
 
@@ -137,7 +88,8 @@ services:
     depends_on:
       - redis
     networks:
-      - vc-net
+      vc-net:
+        ipv4_address: 172.16.50.7
     environment:
       - "CONFIG_YAML=config.yaml"
 
@@ -153,23 +105,11 @@ services:
     depends_on:
       - redis
     networks:
-      - vc-net
+      vc-net:
+        ipv4_address: 172.16.50.8
     environment:
       - "CONFIG_YAML=config.yaml"
 
-  haproxy:
-    container_name: "vc_haproxy"
-    image: "haproxy:alpine"
-    ports:
-      - 80:80
-      - 8404:8404
-    volumes:
-      - ./dev_haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro
-      - ./pki/vc.pem:/etc/ssl/vc.pem:ro
-    networks:
-      vc-net:
-        ipv4_address: 172.16.50.200
-
   redis:
     image: redis:alpine
     container_name: "vc_redis"
@@ -180,7 +120,8 @@ services:
       - redis_data:/data
     command: redis-server --appendonly yes
     networks:
-      - vc-net
+      vc-net:
+        ipv4_address: 172.16.50.9
 
   mongo:
     image: mongo:4.0.10
@@ -191,62 +132,22 @@ services:
     volumes:
       - mongo_data:/data
     networks:
-      - vc-net
+      vc-net:
+        ipv4_address: 172.16.50.10
 
   jaeger:
     image: jaegertracing/all-in-one:latest
     container_name: vc_jaeger
     restart: always
-    links:
-      - haproxy
-    depends_on:
-      - haproxy
     expose:
       - 16686
       - 4317
       - 4318
     networks:
-      - vc-net
+      vc-net:
+        ipv4_address: 172.16.50.11
     environment:
       - "COLLECTOR_OTLP_ENABLED=true"
-      - "HTTP_PROXY=172.16.50.200"
-      - "http_proxy=172.16.50.200"
-      - "HTTPS_PROXY=172.16.50.200"
-      - "https_proxy=172.16.50.200"
-      - "no_proxy=localhost,127.0.0.0/8"
-
-  nsqlookupd:
-    image: nsqio/nsq:v1.2.1
-    container_name: vc_nsqlookupd
-    command: /nsqlookupd
-    networks:
-      - vc-net
-    ports:
-      - "4160"
-      - "4161"
-
-  nsqd:
-    image: nsqio/nsq:v1.2.1
-    container_name: vc_nsqd
-    command: /nsqd --broadcast-address=nsqd --lookupd-tcp-address=vc_nsqlookupd:4160
-    depends_on:
-      - nsqlookupd
-    networks:
-      - vc-net
-    ports:
-      - "4150"
-      - "4151"
-
-  nsqadmin:
-    image: nsqio/nsq:v1.2.1
-    container_name: vc_nsqadmin
-    command: /nsqadmin --lookupd-http-address=vc_nsqlookupd:4161
-    depends_on:
-      - nsqlookupd
-    networks:
-      - vc-net
-    ports:
-      - "4171"
 
 networks:
   vc-net: