Merge pull request #69 from Spacelocust/fix/swagger

Fix / swagger
Spacelocust · Jul 17, 2024 · 34c6a3e · 34c6a3e
2 parents 3cf1609 + dba91f0
commit 34c6a3e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 18 deletions.
diff --git a/.github/workflows/docker-api.yml b/.github/workflows/docker-api.yml
@@ -50,7 +50,7 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           push: ${{ github.event_name != 'pull_request' }}
           tags: spacelocust/fd-api:latest
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           cache-from: type=gha
           cache-to: type=gha,mode=max
         env:

diff --git a/.github/workflows/docker-migrations.yml b/.github/workflows/docker-migrations.yml
@@ -47,7 +47,7 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           push: ${{ github.event_name != 'pull_request' }}
           tags: spacelocust/fd-migrations:latest
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           cache-from: type=gha
           cache-to: type=gha,mode=max
         env:

diff --git a/api/internal/server/server.go b/api/internal/server/server.go
@@ -69,8 +69,14 @@ func NewServer() *http.Server {
 		log.Fatal(err)
 	}
 
-	docs.SwaggerInfo.Host = fmt.Sprintf("%s:%s", os.Getenv("API_DOMAIN"), os.Getenv("API_PORT"))
-	docs.SwaggerInfo.Schemes = []string{"http", "https"}
+	// Set up the Swagger documentation
+	if os.Getenv("API_ENV") == "production" {
+		docs.SwaggerInfo.Host = os.Getenv("API_DOMAIN")
+		docs.SwaggerInfo.Schemes = []string{"https"}
+	} else {
+		docs.SwaggerInfo.Host = fmt.Sprintf("%s:%s", os.Getenv("API_DOMAIN"), os.Getenv("API_PORT"))
+		docs.SwaggerInfo.Schemes = []string{"http"}
+	}
 
 	// Declare Server config
 	server := &http.Server{

diff --git a/api/main.go b/api/main.go
@@ -1,12 +1,8 @@
 package main
 
 import (
-	"fmt"
-	"os"
-
 	_ "ariga.io/atlas-provider-gorm/gormschema"
 	"github.com/Spacelocust/for-democracy/cmd"
-	"github.com/Spacelocust/for-democracy/docs"
 )
 
 // @BasePath /
@@ -19,15 +15,5 @@ import (
 // @license.name Apache 2.0
 // @license.url http://www.apache.org/licenses/LICENSE-2.0.html
 func main() {
-
-	// Set up the Swagger documentation
-	if os.Getenv("API_ENV") == "production" {
-		docs.SwaggerInfo.Host = os.Getenv("API_DOMAIN")
-		docs.SwaggerInfo.Schemes = []string{"https"}
-	} else {
-		docs.SwaggerInfo.Host = fmt.Sprintf("%s:%s", os.Getenv("API_DOMAIN"), os.Getenv("API_PORT"))
-		docs.SwaggerInfo.Schemes = []string{"http"}
-	}
-
 	cmd.RunCLI()
 }