Skip to content

Commit 28ec75e

Browse files
rohaizanrrohaizanr
authored
Merge pull request #308 from rohaizanr:fix-saas-publish
Fix-saas-publish
2 parents 58f0692 + 33fa40c commit 28ec75e

File tree

17 files changed

+208
-91
lines changed

17 files changed

+208
-91
lines changed

‎api/cadangan-api/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ COPY --from=builder /app/wait-for-it.sh .
4343
COPY --from=builder /app/docs ./docs
4444

4545
# Expose the port that your application will run on
46-
EXPOSE 8080
46+
EXPOSE $SERVER_PORT
4747

4848
# Script to dynamically generate .env.docker at runtime
4949
COPY generate-env.sh /docker-entrypoint.d/generate-env.sh

‎api/cadangan-api/main.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,22 @@ func main() {
5555
_router := gin.Default()
5656

5757
isLocalEnv := os.Getenv("GO_ENV")
58-
if isLocalEnv == "local" || isLocalEnv == "dev" {
59-
// enable cors for *
60-
config.AllowHeaders = []string{"*"}
61-
// enable swagger for dev env
62-
_router.GET("/docs/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
63-
// enable multi tenancy for dev
64-
_router.Use(sgin.MultiTenancy(emasjidsaas.TenantStorage))
65-
} else if isLocalEnv == "prod" {
58+
isSaasDisabled := os.Getenv("DISABLE_SAAS")
59+
if (isLocalEnv == "docker" && isSaasDisabled != "true") {
6660
config.AllowCredentials = true
6761
config.AllowHeaders = []string{"Origin", "Content-Type", "Authorization"}
6862
// enable keycloak for prod env
6963
_router.Use(security.AuthMiddleware)
7064
// enable multi tenancy for *.e-masjid.my
7165
_router.Use(sgin.MultiTenancy(emasjidsaas.TenantStorage,
7266
sgin.WithMultiTenancyOption(shttp.NewWebMultiTenancyOption("", "([-a-z0-9]+)\\.e-masjid\\.my"))))
67+
} else {
68+
// enable cors for *
69+
config.AllowHeaders = []string{"*"}
70+
// enable swagger for dev env
71+
_router.GET("/docs/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
72+
// enable multi tenancy for dev
73+
_router.Use(sgin.MultiTenancy(emasjidsaas.TenantStorage))
7374
}
7475

7576
// enable cors

‎api/cadangan-public-api/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ COPY --from=builder /app/cadangan-public-api .
4242
COPY --from=builder /app/wait-for-it.sh .
4343

4444
# Expose the port that your application will run on
45-
EXPOSE 8080
45+
EXPOSE $SERVER_PORT
4646

4747
# Script to dynamically generate .env.docker at runtime
4848
COPY generate-env.sh /docker-entrypoint.d/generate-env.sh

‎api/cadangan-public-api/main.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,19 @@ func main() {
5454
_router := gin.Default()
5555

5656
isLocalEnv := os.Getenv("GO_ENV")
57-
if isLocalEnv == "local" || isLocalEnv == "dev" {
57+
isSaasDisabled := os.Getenv("DISABLE_SAAS")
58+
if (isLocalEnv == "docker" && isSaasDisabled != "true") {
59+
config.AllowHeaders = []string{"Origin", "Content-Type", "Authorization"}
60+
// enable multi tenancy for *.e-masjid.my
61+
_router.Use(sgin.MultiTenancy(emasjidsaas.TenantStorage,
62+
sgin.WithMultiTenancyOption(shttp.NewWebMultiTenancyOption("", "([-a-z0-9]+)\\.e-masjid\\.my"))))
63+
} else {
5864
// enable cors for *
5965
config.AllowHeaders = []string{"*"}
6066
// enable swagger for dev env
6167
_router.GET("/docs/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
6268
// enable multi tenancy for dev
6369
_router.Use(sgin.MultiTenancy(emasjidsaas.TenantStorage))
64-
} else if isLocalEnv == "prod" {
65-
config.AllowHeaders = []string{"Origin", "Content-Type", "Authorization"}
66-
// enable multi tenancy for *.e-masjid.my
67-
_router.Use(sgin.MultiTenancy(emasjidsaas.TenantStorage,
68-
sgin.WithMultiTenancyOption(shttp.NewWebMultiTenancyOption("", "([-a-z0-9]+)\\.e-masjid\\.my"))))
6970
}
7071

7172
_router.Use(cors.New(config))

‎api/khairat-api/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ COPY --from=builder /app/wait-for-it.sh .
4343
COPY --from=builder /app/docs ./docs
4444

4545
# Expose the port that your application will run on
46-
EXPOSE 8080
46+
EXPOSE $SERVER_PORT
4747

4848
# Script to dynamically generate .env.docker at runtime
4949
COPY generate-env.sh /docker-entrypoint.d/generate-env.sh

‎api/khairat-api/main.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,21 +75,22 @@ func main() {
7575
_router := gin.Default()
7676

7777
isLocalEnv := os.Getenv("GO_ENV")
78-
if isLocalEnv == "local" || isLocalEnv == "dev" {
79-
// enable cors for *
80-
config.AllowHeaders = []string{"*"}
81-
// enable swagger for dev env
82-
_router.GET("/docs/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
83-
// enable multi tenancy for dev
84-
_router.Use(sgin.MultiTenancy(emasjidsaas.TenantStorage))
85-
} else if isLocalEnv == "prod" {
78+
isSaasDisabled := os.Getenv("DISABLE_SAAS")
79+
if (isLocalEnv == "docker" && isSaasDisabled != "true") {
8680
config.AllowCredentials = true
8781
config.AllowHeaders = []string{"Origin", "Content-Type", "Authorization"}
8882
// enable keycloak for prod env
8983
_router.Use(security.AuthMiddleware)
9084
// enable multi tenancy for *.e-masjid.my
9185
_router.Use(sgin.MultiTenancy(emasjidsaas.TenantStorage,
9286
sgin.WithMultiTenancyOption(shttp.NewWebMultiTenancyOption("", "([-a-z0-9]+)\\.e-masjid\\.my"))))
87+
} else {
88+
// enable cors for *
89+
config.AllowHeaders = []string{"*"}
90+
// enable swagger for dev env
91+
_router.GET("/docs/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
92+
// enable multi tenancy for dev
93+
_router.Use(sgin.MultiTenancy(emasjidsaas.TenantStorage))
9394
}
9495

9596
_router.Use(cors.New(config))

‎api/tabung-api/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ COPY --from=builder /app/wait-for-it.sh .
4444
COPY --from=builder /app/docs ./docs
4545

4646
# Expose the port that your application will run on
47-
EXPOSE 8080
47+
EXPOSE $SERVER_PORT
4848

4949
# Script to dynamically generate .env.docker at runtime
5050
COPY generate-env.sh /docker-entrypoint.d/generate-env.sh

‎api/tabung-api/main.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,21 @@ func main() {
7070
_router := gin.Default()
7171

7272
isLocalEnv := os.Getenv("GO_ENV")
73-
if isLocalEnv == "local" || isLocalEnv == "dev" {
74-
config.AllowHeaders = []string{"*"}
75-
// enable swagger for dev env
76-
_router.GET("/docs/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
77-
// enable multi tenancy for dev
78-
_router.Use(sgin.MultiTenancy(emasjidsaas.TenantStorage))
79-
} else if isLocalEnv == "prod" {
73+
isSaasDisabled := os.Getenv("DISABLE_SAAS")
74+
if (isLocalEnv == "docker" && isSaasDisabled != "true") {
8075
config.AllowCredentials = true
8176
config.AllowHeaders = []string{"Origin", "Content-Type", "Authorization"}
8277
// enable keycloak for prod env
8378
_router.Use(security.AuthMiddleware)
8479
// enable multi tenancy for *.e-masjid.my
8580
_router.Use(sgin.MultiTenancy(emasjidsaas.TenantStorage,
8681
sgin.WithMultiTenancyOption(shttp.NewWebMultiTenancyOption("", "([-a-z0-9]+)\\.e-masjid\\.my"))))
82+
} else {
83+
config.AllowHeaders = []string{"*"}
84+
// enable swagger for dev env
85+
_router.GET("/docs/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
86+
// enable multi tenancy for dev
87+
_router.Use(sgin.MultiTenancy(emasjidsaas.TenantStorage))
8788
}
8889

8990
// enable cors

‎api/tetapan-api/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ COPY --from=builder /app/wait-for-it.sh .
4444
COPY --from=builder /app/docs ./docs
4545

4646
# Expose the port that your application will run on
47-
EXPOSE 8080
47+
EXPOSE $SERVER_PORT
4848

4949
# Script to dynamically generate .env.docker at runtime
5050
COPY generate-env.sh /docker-entrypoint.d/generate-env.sh

‎api/tetapan-api/main.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,20 +61,21 @@ func main() {
6161

6262

6363
isLocalEnv := os.Getenv("GO_ENV")
64-
if isLocalEnv == "local" || isLocalEnv == "dev" {
65-
config.AllowHeaders = []string{"*"}
66-
// enable swagger for dev env
67-
_router.GET("/docs/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
68-
// enable multi tenancy for dev
69-
_router.Use(sgin.MultiTenancy(emasjidsaas.TenantStorage))
70-
} else if isLocalEnv == "prod" {
64+
isSaasDisabled := os.Getenv("DISABLE_SAAS")
65+
if (isLocalEnv == "docker" && isSaasDisabled != "true") {
7166
config.AllowCredentials = true
7267
config.AllowHeaders = []string{"Origin", "Content-Type", "Authorization"}
7368
// enable keycloak for prod env
7469
_router.Use(security.AuthMiddleware)
7570
// enable multi tenancy for *.e-masjid.my
7671
_router.Use(sgin.MultiTenancy(emasjidsaas.TenantStorage,
7772
sgin.WithMultiTenancyOption(shttp.NewWebMultiTenancyOption("", "([-a-z0-9]+)\\.e-masjid\\.my"))))
73+
} else {
74+
config.AllowHeaders = []string{"*"}
75+
// enable swagger for dev env
76+
_router.GET("/docs/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
77+
// enable multi tenancy for dev
78+
_router.Use(sgin.MultiTenancy(emasjidsaas.TenantStorage))
7879
}
7980

8081
_router.Use(cors.New(config))

0 commit comments

Comments
 (0)