diff --git a/Dockerfile b/Dockerfile index ecc0414..55f6d35 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG GOLANG_TAG=193044292705.dkr.ecr.ap-south-1.amazonaws.com/common/golang:1.19 +ARG GOLANG_TAG=golang:1.23 # To run locally, use #ARG GOLANG_TAG=registry.cmd.navi-tech.in/common/golang:1.19 diff --git a/cmd/migrations/main.go b/cmd/migrations/main.go index 8cda7b7..52af176 100644 --- a/cmd/migrations/main.go +++ b/cmd/migrations/main.go @@ -18,13 +18,13 @@ func main() { RunE: func(cmd *cobra.Command, args []string) error { err := mig.RunDatabaseMigrations() if err != nil { - log.Fatal("cybertron migrations failed", zap.Error(err)) + log.Log.Fatal("cybertron migrations failed", zap.Error(err)) } return nil }, } if err := command.Execute(); err != nil { - log.Fatal("cybertron migrations command execution failed", zap.Error(err)) + log.Log.Fatal("cybertron migrations command execution failed", zap.Error(err)) } } diff --git a/configs/application.yml b/configs/application.yml index dffa4d4..71f6f56 100644 --- a/configs/application.yml +++ b/configs/application.yml @@ -1,8 +1,8 @@ -port: 9000 -name: cybertron -env: local +port: PORT +name: NAME +env: ENV metrics: - port: 4001 + port: METRICS_PORT timezone: Asia/Kolkata #DB config @@ -16,19 +16,19 @@ db: max: idle: 10 open: 300 - username: postgres - password: admin - host: office-server.tail3fba9.ts.net + username: DB_USERNAME + password: DB_PASSWORD + host: DB_HOST port: 5432 - name: cybertron_dev + name: DB_NAME ssl: mode: disable #Prometheus config prometheus: - app.name: cybertron - host: localhost - port: 4001 + app.name: PROMETHEUS_APP_NAME + host: PROMETHEUS_HOST + port: PROMETHEUS_POST enabled: true timeout: 10 flush.interval.in.ms: 200 @@ -42,12 +42,12 @@ http: # Kafka config kafka: - password: kDia1uC.GI;)Al5eQ)+Q - username: varnitgoyal/varnitgoyal95@gmail.com/ocid1.streampool.oc1.ap-mumbai-1.amaaaaaaotdslraanepwp54txqqxkmg4l6dghrhufiezqkx2lqhndgxoq7pa - brokers: cell-1.streaming.ap-mumbai-1.oci.oraclecloud.com:9092 + password: KAFKA_PASSWORD + username: KAFKA_USERNAME + brokers: KAFKA_BROKERS group: - names: {"kafka-stream": "kafka-stream"} - topics: {"kafka-stream": "kafka-stream"} + names: KAFKA_GROUP + topics: KAFKA_TOPICS tls: insecureSkipVerify: true enabled: false @@ -67,22 +67,22 @@ DocumentService: generate_token: DOCUMENT_SERVICE_MOCK_GENERATE_TOKEN elastic: - addresses: https://office-server.tail3fba9.ts.net:9200 - username: elastic - password: 9457611267 - index: cybertron - api_key: SFQ1aHhwRUJWRVNkVUlrRWZMYWk6ZFpDTnpWYXdTNDYwdGt1QzlaRV9YQQ== + addresses: ELASTIC_ADDRESS + username: ELASTIC_USERNAME + password: ELASTIC_PASSWORD + index: ELASTIC_INDEX + api_key: ELASTIC_API_KEY aws: - region: ap-south-1 - bucket: navi-cd955a63c4476df0f00c1cea0e4a40d1 + region: AWS_REGION + bucket: AWS_BUCKET mjolnir: - service.url: https://qa-mjolnir-service.np.navi-ppl.in - realm.id: ZicSxsvBwE + service.url: MJOLNIR_SERVICE_URL + realm.id: MJOLNIR_REALM houston: - service.url: https://qa-houston.np.navi-sa.in - realm.id: ZicSxsvBwE + service.url: HOUSTON_SERVICE_URL + realm.id: HOUSTON_REALM_ID diff --git a/db/migrations.go b/db/migrations.go index a1416ee..bc291da 100644 --- a/db/migrations.go +++ b/db/migrations.go @@ -16,6 +16,7 @@ func RunDatabaseMigrations() error { var err error postgresConfig := configs.GetPostgresMigConfig() appMigrate, err := migrate.New("file://"+dbMigrationsPath, postgresConfig.GetPostgresUrl()) + if err != nil { log.Log.GetLog().Error("migrations error", zap.Error(err)) panic(err) diff --git a/db/migrations/202310201651_initial-migration.up.sql b/db/migrations/202310201651_initial-migration.up.sql index faebb4b..ba6ea23 100644 --- a/db/migrations/202310201651_initial-migration.up.sql +++ b/db/migrations/202310201651_initial-migration.up.sql @@ -1 +1 @@ -create database cybertron_dev; +create database cybertron_dev;