FileStorage add on in the CLI

Sunbird-RC · Sep 19, 2023 · f8bb890 · f8bb890
1 parent cf33a8a
commit f8bb890
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 3 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -74,7 +74,7 @@ services:
       - certificate_health_check_url=http://certificate-api:8078/health
       - template_base_url=http://registry:8081/api/v1/templates/ #Looks for certificate templates for pdf copy of the signed certificate
       - sunbird_keycloak_user_set_password=true
-      - filestorage_enabled=false
+      - filestorage_enabled=${FILESSTORAGE_ENABLED-false}
       - filestorage_connection_url=http://file-storage:9000
       - filestorage_access_key=admin
       - filestorage_secret_key=12345678

diff --git a/tools/cli/src/config/config.ts b/tools/cli/src/config/config.ts
@@ -1,4 +1,3 @@
-
 export interface Config {
 	DEFAULT_ES_PROVIDER_NAME: string
 	DEFAULT_NS_PROVIDER_NAME: string

diff --git a/tools/cli/src/templates/.env b/tools/cli/src/templates/.env
diff --git a/tools/cli/src/templates/.env b/tools/cli/src/templates/.env
@@ -0,0 +1 @@
+../../../../.env
diff --git a/tools/cli/src/templates/.env-cli b/tools/cli/src/templates/.env-cli
@@ -11,3 +11,4 @@ SIGNATURE_ENABLED=<%= props.signatureEnabled %>
 SEARCH_PROVIDER_NAME=<%= props.searchProvideName %> 
 EVENT_ENABLED=<%= props.eventEnabled %>
 CLAIMS_ENABLED=<%= props.enableAttestation %>
+FILESSTORAGE_ENABLED=<%= props.fileStorageEnabled %>
diff --git a/tools/cli/src/templates/config.json b/tools/cli/src/templates/config.json
diff --git a/tools/cli/src/templates/config.json b/tools/cli/src/templates/config.json
@@ -0,0 +1 @@
+../../../../imports/config.json
diff --git a/tools/cli/src/templates/docker-compose.yml b/tools/cli/src/templates/docker-compose.yml
diff --git a/tools/cli/src/templates/docker-compose.yml b/tools/cli/src/templates/docker-compose.yml
@@ -0,0 +1 @@
+../../../../docker-compose.yml
diff --git a/tools/cli/src/toolbox/registry/create.ts b/tools/cli/src/toolbox/registry/create.ts
@@ -24,6 +24,8 @@ export default async (toolbox: Toolbox, setupOptions: RegistrySetupOptions) => {
 		config.docker_service_name.REGISTRY,
 		config.docker_service_name.KEYCLOAK,
 	]
+
+	setupOptions.fileStorageEnabled = false
 
 	// Enable redis for distributed systems
 	if (
@@ -43,6 +45,7 @@ export default async (toolbox: Toolbox, setupOptions: RegistrySetupOptions) => {
 			config.docker_service_name.CERTIFICATE_SIGHNER,
 			config.docker_service_name.FILE_STORAGE
 		)
+		setupOptions.fileStorageEnabled = true
 	}
 
 	// Set ManagerType
@@ -66,6 +69,7 @@ export default async (toolbox: Toolbox, setupOptions: RegistrySetupOptions) => {
 			config.docker_service_name.CERTIFICATE_API,
 			config.docker_service_name.FILE_STORAGE
 		)
+		setupOptions.fileStorageEnabled = true
 	}
 
 	// enable Auxiliary services

diff --git a/tools/cli/src/toolbox/registry/helpers/keycloak.ts b/tools/cli/src/toolbox/registry/helpers/keycloak.ts
@@ -73,7 +73,6 @@ class KeycloakWrapper {
 		throw new Error(
 			`API call failed to fetch token from keycloak after ${maxRetries} retries.`
 		)
-
 	}
 
 	// Get the keycloak client ID of a client

diff --git a/tools/cli/src/types.ts b/tools/cli/src/types.ts
@@ -80,6 +80,7 @@ export interface RegistrySetupOptions {
 	signatureEnabled: boolean
 	eventEnabled: boolean
 	enableAttestation: boolean
+	fileStorageEnabled : boolean
 }
 
 export interface RegistryTearDownOptions {
-Original file line number
+Diff line change
@@ Expand Up / @@ -73,7 +73,6 @@ class KeycloakWrapper { @@
     		throw new Error(
     			`API call failed to fetch token from keycloak after ${maxRetries} retries.`
     		)
     	}
     	// Get the keycloak client ID of a client
@@ Expand Down @@