diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a797fd..0123757 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,13 +13,17 @@ stages: build-2: stage: build-image - image: docker/compose:latest + image: docker:24.0.5 services: - - name: docker:dind - command: [ "--insecure-registry=103.82.242.92:8900" ] + - name: docker:24.0.5-dind + command: ["--tls=false", "--insecure-registry=103.82.242.92:8900"] + variables: + DOCKER_HOST: tcp://docker:2375 + DOCKER_TLS_CERTDIR: "" script: - - docker login -u $DEPLOY_USERNAME -p $DEPLOY_TOKEN 103.82.242.92:8900 - - docker-compose build + - docker logout + - echo "$DEPLOY_TOKEN" | docker login -u "$DEPLOY_USERNAME" --password-stdin http://103.82.242.92:8900 + - docker compose build - docker tag registry.gitlab.com/hanifsalafi/netidhub-saas-be:dev 103.82.242.92:8900/medols/netidhub-saas-be:dev - docker push 103.82.242.92:8900/medols/netidhub-saas-be:dev @@ -27,7 +31,5 @@ deploy: stage: deploy when: on_success image: curlimages/curl:latest - services: - - docker:dind script: - - curl --user $JENKINS_USER:$JENKINS_PWD http://38.47.180.165:8080/job/autodeploy-netidhub-be/build?token=autodeploynetidhub \ No newline at end of file + - curl --user $JENKINS_USER:$JENKINS_PWD "http://103.31.38.120:8080/job/autodeploy-netidhub-be/build?token=autodeploynetidhub" diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..608d3c6 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,15 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "Launch Package", + "type": "go", + "request": "launch", + "mode": "auto", + "program": "${fileDirname}" + } + ] +} \ No newline at end of file diff --git a/app/database/index.database.go b/app/database/index.database.go index 18e4017..f5600b0 100644 --- a/app/database/index.database.go +++ b/app/database/index.database.go @@ -36,15 +36,31 @@ func NewDatabase(cfg *config.Config, log zerolog.Logger) *Database { func (_db *Database) ConnectDatabase() { logMode := _db.Cfg.DB.Postgres.LogMode var logLevel logger.LogLevel - if logMode == "INFO" { + + switch logMode { + case "INFO": logLevel = logger.Info - } else if logMode == "WARN" { + case "WARN": logLevel = logger.Warn - } else if logMode == "ERROR" { + case "ERROR": logLevel = logger.Error - } else if logMode == "NONE" { + case "NONE": + logLevel = logger.Silent + default: logLevel = logger.Silent } + + // var logLevel logger.LogLevel + // if logMode == "INFO" { + // logLevel = logger.Info + // } else if logMode == "WARN" { + // logLevel = logger.Warn + // } else if logMode == "ERROR" { + // logLevel = logger.Error + // } else if logMode == "NONE" { + // logLevel = logger.Silent + // } + conn, err := gorm.Open(postgres.Open(_db.Cfg.DB.Postgres.DSN), &gorm.Config{ Logger: logger.Default.LogMode(logLevel), }) diff --git a/config/toml/config.toml b/config/toml/config.toml index e3f680a..a831040 100644 --- a/config/toml/config.toml +++ b/config/toml/config.toml @@ -13,7 +13,7 @@ body-limit = 1048576000 # "100 * 1024 * 1024" primary-client-key = "78356d32-52fa-4dfc-b836-6cebf4e3eead" [db.postgres] -dsn = "postgresql://netidhub_user:NetidhubDB@2025@38.47.180.165:5432/netidhub_db" # ://:@:/ +dsn = "postgresql://netidhub_user:NetidhubDB%402025@157.10.161.198:5432/netidhub_db" # ://:@:/ log-mode = "ERROR" migrate = true seed = false @@ -25,10 +25,10 @@ level = 0 # panic -> 5, fatal -> 4, error -> 3, warn -> 2, info -> 1, debug -> 0 prettier = true [objectstorage.miniostorage] -endpoint = "38.47.180.165:9009" -access-key-id = "lBtjqWidHz1ktBbduwGy" -secret-access-key = "nsedJIa2FI7SqsEVcSFqJrlP4JuFRWGLauNpzD0i" -use-ssl = false +endpoint = "https://is3.cloudhost.id" +access-key-id = "YRP1RM617986USRU6NN8" +secret-access-key = "vfbwQDYb1m7nfzo4LVEz90BIyOWfBMZ6bfGQbqDO" +use-ssl = true bucket-name = "netidhub" location = "us-east-1" @@ -67,7 +67,7 @@ enable = true retention = 30 [keycloak] -endpoint = "http://38.47.180.165:8008" +endpoint = "http://103.31.38.120:8080" realm = "medols" client-id = "medols-app" client-secret = "iyonEpZbAUs20quwaNFLMwRX7MUgPRlS"