Merge pull request #2 from ccsapp/move-to-github

Move to GitHub
ccsapp · Jul 1, 2023 · e96b098 · e96b098
2 parents 1aafc51 + 33e96ee
commit e96b098
Show file tree

Hide file tree

Showing 23 changed files with 249 additions and 387 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -0,0 +1,40 @@
+name: Go
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+defaults:
+  run:
+    working-directory: ./src
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    env:
+      MONGODB_CONNECTION_STRING: ${{ secrets.MONGODB_CONNECTION_STRING }}
+      MONGODB_DATABASE_NAME: ${{ vars.MONGODB_DATABASE_NAME }}
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Go
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.19
+
+    - name: Go Generate
+      run: go generate -v ./...
+
+    - name: Build
+      run: go build -v ./...
+
+    - name: Test
+      run: go test -v ./...
+
+    - name: Upload Sequence Diagrams
+      uses: actions/upload-artifact@v3
+      with:
+          name: sequence-diagrams
+          path: ./src/.sequence/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
diff --git a/README.md b/README.md
@@ -2,13 +2,11 @@
 Car is a domain layer microservice of CCSAppVP2 that provides static and dynamic car data.
 
 Since the models that Car uses are also needed in other microservices they were extracted to a separate repository. 
-The models are available at the private Git repository 
-[CarGoTypes](https://git.scc.kit.edu/cm-tm/cm-team/projectwork/pse/domain/d-cargotypes) to provide mappings for the 
-JSON responses.
-Further information on the usage of private Git repositories with go can be found there.
+The models are available at 
+[cargotypes](https://github.com/ccsapp/cargotypes) to provide mappings for the JSON responses.
 
 The provided API endpoints of Car are specified in the
-[API specification](https://git.scc.kit.edu/cm-tm/cm-team/projectwork/pse/domain/d-cardesign/-/blob/main/openapi.yaml).
+[API specification](https://github.com/ccsapp/CarDesign/blob/main/openapi.yaml).
 
 ## Local Setup Mode
 To run the microservice Car locally, you can use the MongoDB setup provided in the `dev` directory.
@@ -51,15 +49,12 @@ correct docker compose stack is running and will print a warning if it is not.
 Do not use the local setup mode in a deployment or a custom setup, i.e. do not set the `CAR_LOCAL_SETUP` environment
 variable. Instead, use the following environment variables to configure the microservice:
 
-| Environment Variable        | Local Setup Value | Comment                                                                                                               |
-|-----------------------------|-------------------|-----------------------------------------------------------------------------------------------------------------------|
-| `MONGODB_DATABASE_HOST`     | localhost         |                                                                                                                       |
-| `MONGODB_DATABASE_PORT`     | 27021             | Optional, defaults to 27017. The local setup uses a non-default port!                                                 |
-| `MONGODB_DATABASE_NAME`     | ccsappvp2car      |                                                                                                                       |
-| `MONGODB_DATABASE_USER`     | root              |                                                                                                                       |
-| `MONGODB_DATABASE_PASSWORD` | example           |                                                                                                                       |
-| `CAR_EXPOSE_PORT`           | 8001              | Optional, defaults to 80. This is the port this microservice is exposing. The local setup exposes a non-default port! |
-| `CAR_COLLECTION_PREFIX`     | localSetup-       | Optional. A (unique) prefix that is prepended to every database collection of this service.                           |
+| Environment Variable        | Local Setup Value                                   | Comment                                                                                                               |
+|-----------------------------|-----------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------|
+| `MONGODB_CONNECTION_STRING` | mongodb://root:example@localhost:27021/ccsappvp2car |                                                                                                                       |
+| `MONGODB_DATABASE_NAME`     | ccsappvp2car                                        |                                                                                                                       |
+| `CAR_EXPOSE_PORT`           | 8001                                                | Optional, defaults to 80. This is the port this microservice is exposing. The local setup exposes a non-default port! |
+| `CAR_COLLECTION_PREFIX`     | localSetup-                                         | Optional. A (unique) prefix that is prepended to every database collection of this service.                           |
 
 ## Testing
 

diff --git a/helm/.env b/helm/.env
diff --git a/helm/.helmignore b/helm/.helmignore
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
diff --git a/helm/values.yaml b/helm/values.yaml
diff --git a/src/api/controller.go b/src/api/controller.go
@@ -2,7 +2,7 @@ package api
 
 import (
 	"DCar/infrastructure/database"
-	carTypes "git.scc.kit.edu/cm-tm/cm-team/projectwork/pse/domain/d-cargotypes.git"
+	carTypes "github.com/ccsapp/cargotypes"
 	"github.com/labstack/echo/v4"
 	"net/http"
 )

diff --git a/src/api/controller_test.go b/src/api/controller_test.go
@@ -4,7 +4,7 @@ import (
 	"DCar/mocks"
 	"context"
 	"errors"
-	carTypes "git.scc.kit.edu/cm-tm/cm-team/projectwork/pse/domain/d-cargotypes.git"
+	carTypes "github.com/ccsapp/cargotypes"
 	openapiTypes "github.com/deepmap/oapi-codegen/pkg/types"
 	"github.com/golang/mock/gomock"
 	"github.com/labstack/echo/v4"

diff --git a/src/api/definition.go b/src/api/definition.go
@@ -3,7 +3,7 @@ package api
 
 import (
 	"fmt"
-	carTypes "git.scc.kit.edu/cm-tm/cm-team/projectwork/pse/domain/d-cargotypes.git"
+	carTypes "github.com/ccsapp/cargotypes"
 	"net/http"
 
 	"github.com/deepmap/oapi-codegen/pkg/runtime"

diff --git a/src/environment/environment.go b/src/environment/environment.go
@@ -16,36 +16,21 @@ func GetEnvironment() *Environment {
 }
 
 type Environment struct {
-	mongoDbHost         string
-	mongoDbPort         int
-	mongoDbDatabase     string
-	mongoDbUser         string
-	mongoDbPassword     string
-	appExposePort       int
-	appCollectionPrefix string
-	isLocalSetupMode    bool
+	mongoDbConnectionString string
+	mongoDbDatabase         string
+	appExposePort           int
+	appCollectionPrefix     string
+	isLocalSetupMode        bool
 }
 
-func (e *Environment) GetMongoDbHost() string {
-	return e.mongoDbHost
-}
-
-func (e *Environment) GetMongoDbPort() int {
-	return e.mongoDbPort
+func (e *Environment) GetMongoDbConnectionString() string {
+	return e.mongoDbConnectionString
 }
 
 func (e *Environment) GetMongoDbDatabase() string {
 	return e.mongoDbDatabase
 }
 
-func (e *Environment) GetMongoDbUser() string {
-	return e.mongoDbUser
-}
-
-func (e *Environment) GetMongoDbPassword() string {
-	return e.mongoDbPassword
-}
-
 func (e *Environment) GetAppExposePort() int {
 	return e.appExposePort
 }

diff --git a/src/environment/localSetup.env b/src/environment/localSetup.env
@@ -1,7 +1,4 @@
-MONGODB_DATABASE_HOST=localhost
-MONGODB_DATABASE_PORT=27021
+MONGODB_CONNECTION_STRING=mongodb://root:example@localhost:27021/ccsappvp2car
 MONGODB_DATABASE_NAME=ccsappvp2car
-MONGODB_DATABASE_USER=root
-MONGODB_DATABASE_PASSWORD=example
 CAR_EXPOSE_PORT=8001
 CAR_COLLECTION_PREFIX=localSetup-