Updating files

.gitignore

@@ -1,6 +1,5 @@
 # Binaries for programs and plugins
-**/server
-!**/server/
+**/server/server
 *.exe
 *.exe~
 *.dll
@@ -10,7 +9,11 @@ gomock_*
 badger
 mapping_badger
 study
-test
+
+# sensitive info 
+# **/cert.pem
+# **/key.pem
+
 
 # Test binary, built with `go test -c`
 *.test
@@ -21,32 +24,20 @@ test
 
 # VSCode
 .vscode/*
+.vs/*
 !.vscode/settings.json
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
 
-# Test Data files
-**/*.zip
-
-# Docker files
-Dockerfile
-Dockerfile*
-docker-compose.yml
-
-# Deployment files
-**/.gitlab-ci.yml
-**/.golangci.yml
-**/*-service.yml
-**/sonar-project.properties
+# VSCode
+.idea/*
 
-# Configuraiton files
-**/config-*.toml
-!**/config-local.toml
-karate-config.js
+graphql
 
-# sql DB scripts
-1_optisam_db.sql
+# Karate
+**/target/*
+*karate.jar*
+*karate-0.9.6.jar*
+# *karate-config.js*
 
-# nifi-service
-nifi-service/**/*

.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>optisam-backend</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+</projectDescription>

.settings/.jsdtscope

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="src" path=""/>
+	<classpathentry kind="output" path=""/>
+</classpath>

.settings/org.eclipse.wst.jsdt.ui.superType.container

@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.JRE_CONTAINER

.settings/org.eclipse.wst.jsdt.ui.superType.name

@@ -0,0 +1 @@
+Global

.vscode/launch.json

@@ -9,7 +9,7 @@
             "type": "go",
             "request": "launch",
             "mode": "auto",
-            "program": "${workspaceRoot}/equipment-service/cmd/server/main.go",
+            "program": "${workspaceRoot}/license-service/cmd/server/main.go",
             "env": {},
             "args": []
         }

.vscode/settings.json

@@ -4,6 +4,7 @@
       "editor.formatOnSave": true,
       "editor.codeActionsOnSave": {
           "source.organizeImports": true,
+          "source.fixAll": true,
       },
       // Optional: Disable snippets, as they conflict with completion ranking.
       "editor.snippetSuggestions": "none",
@@ -28,5 +29,6 @@
     "-count=1",
     "-v"
 ],
-"karateRunner.tests.activityBarDisplayType": "Deep"
+"karateRunner.tests.activityBarDisplayType": "Deep",
+"workbench.editor.wrapTabs": true
 }

Dockerfile_go_builder

@@ -0,0 +1,15 @@
+FROM golang:1.11.5-alpine as buildenv
+
+LABEL name="OPISAM" \
+    description="Optisam Go Builder" \
+    authors="Vijay Kumar" \
+    maintainer="Dharmjit Singh <[email protected]>" \
+    url="https://gitlab.forge.orange-labs.fr/optisam/optisam-backend.git"
+
+
+WORKDIR /src
+
+RUN apk add --no-cache ca-certificates git
+
+COPY ./go.mod ./go.sum ./
+RUN GO111MODULE=on go mod download

README.md

@@ -1,33 +1,35 @@
+[![pipeline status](https://gitlab.tech.orange/optisam/optisam-it/optisam-backend/badges/develop/pipeline.svg)](https://gitlab.forge.orange-labs.fr/OrangeMoney/optisam/optisam-backend/commits/develop) [![coverage report](https://gitlab.tech.orange/optisam/optisam-it/optisam-backend/badges/develop/coverage.svg)](https://gitlab.forge.orange-labs.fr/OrangeMoney/optisam/optisam-backend/commits/develop)
+
 OpTISAM
-======
+=======
 
-__OPTISAM__ (Optimized tool for inventive Software Asset Management) is a tool for the Software Asset Management Compliance Audit and Optimization Tool. This monorepo contains all the backend services namely:
+## Introduction
 
+__OPTISAM__ (Optimized tool for inventive Software Asset Management) is a tool for the Software Asset Management Compliance Audit and Optimization Tool. This monorepo contains all the backend services namely:
 
-- account-service
-- application-service
+- [account-service](account-service/dbdoc/README.md)
+- [acqrights-service](acqrights-service/dbdoc/README.md)
+- [application-service](application-service/dbdoc/README.md)
 - auth-service
-- dps-service
+- [dps-service](dps-service/dbdoc/README.md)
 - equipment-service
-- simulation-service
 - import-service
 - license-service
 - metric-service
-- meta-service
-- product-service
-- report-service
-- simulation-service
+- [product-service](product-service/dbdoc/README.md)
+- [report-service](report-service/dbdoc/README.md)
+- [simulation-service](simulation-service/dbdoc/README.md)
 
 ## Quick start
 ### Download
 
 ```
-$ git clone https://github.com/Orange-OpenSource/optisam-backend.git
+$ git clone https://gitlab.tech.orange/optisam/optisam-it/optisam-backend.git
 ```
 
 ### Build
 
-##### - Change configuration file
+##### - Change configuration files
 <em>Update values of config files **${service}/cmd/server/config-local.toml** as per your requirement</em>
 
 * Building docker images for all micro-services
@@ -38,16 +40,6 @@ docker build --pull -t optisam/${service-name}-service:latest -f Dockerfile .
 docker push optisam/${service-name}-service:latest
 ```
 
-<<<<<<< HEAD
-* Building docker image for postgres database having required schema for optisam
-
-```
-cd account-service\pkg\repository\v1\postgres\scripts
-docker build --pull -t optisam/postgres:latest -f Dockerfile .
-docker push optisam/postgres:latest
-```
-
-=======
 ### Run
 
 ##### - Run using Docker-Compose
@@ -58,26 +50,20 @@ you can create and start all the services from your configuration (docker-compos
 docker-compose -f docker-compose.yml pull
 docker-compose -f docker-compose.yml up
 ```
->>>>>>> 656c79b2968dca4313d925964af4179de95d320d
-##### - Play with factory super admin user
 
-1) Once docker-compose is up and running, open optisam dashboard at http://localhost:4200
-2) login with below superadmin credentials
-    * username - [email protected]
-    * password - admin
+---------------------------
+FOr GCP cluster deployment
+Open cloud shell and clone the source code locally
+
+cd ~/optisam-backend 
+export PROJECT_ID=diese-dev-optisam-it
+go build -o account_service/bin/server account-service/cmd/server/main.go
 
-<!-- ### Install and Usage
-## Contribute
-Please read CONTRIBUTING.md for details on our code of conduct, and the process for submitting pull requests to us.
-## Versions  -->
+docker build  -t eu.gcr.io/${PROJECT_ID}/optisam/account-service:v1.0.0 -f account-service/Dockerfile .
+docker push  eu.gcr.io/${PROJECT_ID}/optisam/account-service:v1.0.0
 
-## License
+## replace with other service names for next docker build
 
-Copyright (c) 2019 Orange
+--------------------------------------
 
-This software is distributed under the terms and conditions of the 'Apache License 2.0'
-license which can be found in the file 'License.txt' in this package distribution 
-or at 'http://www.apache.org/licenses/LICENSE-2.0'. 
 
-## Contact
-* Homepage: [opensource.orange.com](http://opensource.orange.com/)

account-service/Dockerfile

@@ -0,0 +1,9 @@
+FROM ubuntu:latest
+
+LABEL name="OPTISAM" \
+description="Optisam Account Service"
+
+WORKDIR /opt/application/
+COPY account_service/bin/ /opt/application/
+EXPOSE 8080
+ENTRYPOINT ./server