Compare commits
No commits in common. "71ea9cac18aa399c2354f4d0112921878b5bd818" and "2b41bbdbb9f69ff950a50b01e2da73a98b808616" have entirely different histories.
71ea9cac18
...
2b41bbdbb9
47
Dockerfile
47
Dockerfile
|
@ -1,47 +0,0 @@
|
|||
# Copyright 2024 Florian Beisel
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# Start from a base image with Go installed and C libraries needed for SQLite.
|
||||
FROM golang:1.21-bookworm as builder
|
||||
|
||||
# Set the working directory.
|
||||
WORKDIR /app
|
||||
|
||||
# Copy the go.mod and go.sum files first and download the modules.
|
||||
# This is to take advantage of Docker's cache layers.
|
||||
COPY go.mod go.sum ./
|
||||
RUN go mod download
|
||||
|
||||
# Copy the rest of the source code.
|
||||
COPY . .
|
||||
|
||||
# Build the binary. CGO is enabled by default in the official Go images.
|
||||
RUN go build -o app .
|
||||
|
||||
# Use Debian as the base for the runtime image as it includes necessary C libraries.
|
||||
FROM debian:bookworm-slim
|
||||
|
||||
# Set the working directory in the container.
|
||||
WORKDIR /root/
|
||||
|
||||
# Copy the binary from the builder stage.
|
||||
COPY --from=builder /app/app .
|
||||
|
||||
# Copy the binary from the builder stage.
|
||||
COPY --from=builder /app/db/migrations db/migrations
|
||||
|
||||
# Add any runtime dependencies here, if needed.
|
||||
|
||||
# Command to run the executable.
|
||||
CMD ["./app"]
|
|
@ -17,19 +17,11 @@ package api
|
|||
import (
|
||||
"errors"
|
||||
"net/http"
|
||||
"reflect"
|
||||
|
||||
"git.beisel.it/florian/hostname-service/rules"
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
// @Summary Returns a list of available rules
|
||||
// @Description Return a list of names of Rules which are known in the RulesRegistry
|
||||
// @ID get-rules
|
||||
// @Produce json
|
||||
// @Security Bearer
|
||||
// @Tags Querying Rules
|
||||
// @Router /rules [get]
|
||||
func ListAvailableRules(c *gin.Context) {
|
||||
descriptions := make(map[string]string)
|
||||
for category, descriptor := range rules.RulesRegistry {
|
||||
|
@ -44,44 +36,3 @@ func getHostnameRuleByCategory(category string) (rules.HostnameRule, error) {
|
|||
}
|
||||
return nil, errors.New("unknown category")
|
||||
}
|
||||
|
||||
// @Summary Returns details about a rule
|
||||
// @Description Returns two obea an Input Object and an Output Object
|
||||
// @Description describing the Rules stored values and required parameters
|
||||
// @ID get-rule-details
|
||||
// @Produce json
|
||||
// @Success 200 {object} models.SimpleHostnameResponse "Hostname"
|
||||
// @Security Bearer
|
||||
// @Tags Querying Rules
|
||||
// @Router /rules/:rule [get]
|
||||
func GetRuleStruct(c *gin.Context) {
|
||||
ruleName := c.Param("rule")
|
||||
|
||||
descriptor, exists := rules.RulesRegistry[ruleName]
|
||||
if !exists {
|
||||
c.JSON(http.StatusNotFound, gin.H{"error": "Rule not found"})
|
||||
return
|
||||
}
|
||||
|
||||
// Create instances of the rule and its input struct
|
||||
ruleInstance := descriptor.Factory()
|
||||
inputInstance := reflect.New(reflect.TypeOf(ruleInstance).Elem()).Interface()
|
||||
|
||||
// Serialize instances to JSON
|
||||
ruleJSON, err := rules.StructToJSON(ruleInstance)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Error serializing rule struct"})
|
||||
return
|
||||
}
|
||||
|
||||
inputJSON, err := rules.StructToJSON(inputInstance)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Error serializing input struct"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
"input": inputJSON,
|
||||
"output": ruleJSON,
|
||||
})
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
CREATE TABLE IF NOT EXISTS hostnames (
|
||||
CREATE TABLE hostnames (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
category TEXT NOT NULL,
|
||||
hostname TEXT NOT NULL,
|
71
docs/docs.go
71
docs/docs.go
|
@ -101,6 +101,32 @@ const docTemplate = `{
|
|||
}
|
||||
}
|
||||
},
|
||||
"/api/rules": {
|
||||
"get": {
|
||||
"description": "Get a list of all available hostname generation rules.",
|
||||
"consumes": [
|
||||
"application/json"
|
||||
],
|
||||
"produces": [
|
||||
"application/json"
|
||||
],
|
||||
"tags": [
|
||||
"Rules"
|
||||
],
|
||||
"summary": "List Available Rules",
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "List of available rules with descriptions",
|
||||
"schema": {
|
||||
"type": "object",
|
||||
"additionalProperties": {
|
||||
"type": "string"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/api/server": {
|
||||
"put": {
|
||||
"security": [
|
||||
|
@ -260,51 +286,6 @@ const docTemplate = `{
|
|||
}
|
||||
}
|
||||
},
|
||||
"/rules": {
|
||||
"get": {
|
||||
"security": [
|
||||
{
|
||||
"Bearer": []
|
||||
}
|
||||
],
|
||||
"description": "Return a list of names of Rules which are known in the RulesRegistry",
|
||||
"produces": [
|
||||
"application/json"
|
||||
],
|
||||
"tags": [
|
||||
"Querying Rules"
|
||||
],
|
||||
"summary": "Returns a list of available rules",
|
||||
"operationId": "get-rules",
|
||||
"responses": {}
|
||||
}
|
||||
},
|
||||
"/rules/:rule": {
|
||||
"get": {
|
||||
"security": [
|
||||
{
|
||||
"Bearer": []
|
||||
}
|
||||
],
|
||||
"description": "Returns two obea an Input Object and an Output Object\ndescribing the Rules stored values and required parameters",
|
||||
"produces": [
|
||||
"application/json"
|
||||
],
|
||||
"tags": [
|
||||
"Querying Rules"
|
||||
],
|
||||
"summary": "Returns details about a rule",
|
||||
"operationId": "get-rule-details",
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Hostname",
|
||||
"schema": {
|
||||
"$ref": "#/definitions/models.SimpleHostnameResponse"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/{category}": {
|
||||
"get": {
|
||||
"security": [
|
||||
|
|
|
@ -95,6 +95,32 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"/api/rules": {
|
||||
"get": {
|
||||
"description": "Get a list of all available hostname generation rules.",
|
||||
"consumes": [
|
||||
"application/json"
|
||||
],
|
||||
"produces": [
|
||||
"application/json"
|
||||
],
|
||||
"tags": [
|
||||
"Rules"
|
||||
],
|
||||
"summary": "List Available Rules",
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "List of available rules with descriptions",
|
||||
"schema": {
|
||||
"type": "object",
|
||||
"additionalProperties": {
|
||||
"type": "string"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/api/server": {
|
||||
"put": {
|
||||
"security": [
|
||||
|
@ -254,51 +280,6 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"/rules": {
|
||||
"get": {
|
||||
"security": [
|
||||
{
|
||||
"Bearer": []
|
||||
}
|
||||
],
|
||||
"description": "Return a list of names of Rules which are known in the RulesRegistry",
|
||||
"produces": [
|
||||
"application/json"
|
||||
],
|
||||
"tags": [
|
||||
"Querying Rules"
|
||||
],
|
||||
"summary": "Returns a list of available rules",
|
||||
"operationId": "get-rules",
|
||||
"responses": {}
|
||||
}
|
||||
},
|
||||
"/rules/:rule": {
|
||||
"get": {
|
||||
"security": [
|
||||
{
|
||||
"Bearer": []
|
||||
}
|
||||
],
|
||||
"description": "Returns two obea an Input Object and an Output Object\ndescribing the Rules stored values and required parameters",
|
||||
"produces": [
|
||||
"application/json"
|
||||
],
|
||||
"tags": [
|
||||
"Querying Rules"
|
||||
],
|
||||
"summary": "Returns details about a rule",
|
||||
"operationId": "get-rule-details",
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Hostname",
|
||||
"schema": {
|
||||
"$ref": "#/definitions/models.SimpleHostnameResponse"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/{category}": {
|
||||
"get": {
|
||||
"security": [
|
||||
|
|
|
@ -212,6 +212,23 @@ paths:
|
|||
summary: Update hostname for category "notebook"
|
||||
tags:
|
||||
- Manipulate existing Hostnames
|
||||
/api/rules:
|
||||
get:
|
||||
consumes:
|
||||
- application/json
|
||||
description: Get a list of all available hostname generation rules.
|
||||
produces:
|
||||
- application/json
|
||||
responses:
|
||||
"200":
|
||||
description: List of available rules with descriptions
|
||||
schema:
|
||||
additionalProperties:
|
||||
type: string
|
||||
type: object
|
||||
summary: List Available Rules
|
||||
tags:
|
||||
- Rules
|
||||
/api/server:
|
||||
post:
|
||||
consumes:
|
||||
|
@ -313,36 +330,6 @@ paths:
|
|||
summary: User login
|
||||
tags:
|
||||
- Authentication
|
||||
/rules:
|
||||
get:
|
||||
description: Return a list of names of Rules which are known in the RulesRegistry
|
||||
operationId: get-rules
|
||||
produces:
|
||||
- application/json
|
||||
responses: {}
|
||||
security:
|
||||
- Bearer: []
|
||||
summary: Returns a list of available rules
|
||||
tags:
|
||||
- Querying Rules
|
||||
/rules/:rule:
|
||||
get:
|
||||
description: |-
|
||||
Returns two obea an Input Object and an Output Object
|
||||
describing the Rules stored values and required parameters
|
||||
operationId: get-rule-details
|
||||
produces:
|
||||
- application/json
|
||||
responses:
|
||||
"200":
|
||||
description: Hostname
|
||||
schema:
|
||||
$ref: '#/definitions/models.SimpleHostnameResponse'
|
||||
security:
|
||||
- Bearer: []
|
||||
summary: Returns details about a rule
|
||||
tags:
|
||||
- Querying Rules
|
||||
securityDefinitions:
|
||||
Bearer:
|
||||
description: Type "Bearer" followed by a space and JWT token.
|
||||
|
|
1
go.mod
1
go.mod
|
@ -27,7 +27,6 @@ require (
|
|||
github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
|
||||
github.com/dgrijalva/jwt-go v3.2.0+incompatible
|
||||
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
|
||||
github.com/gin-contrib/cors v1.5.0
|
||||
github.com/gin-contrib/sse v0.1.0 // indirect
|
||||
github.com/go-playground/locales v0.14.1 // indirect
|
||||
github.com/go-playground/universal-translator v0.18.1 // indirect
|
||||
|
|
2
go.sum
2
go.sum
|
@ -22,8 +22,6 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumC
|
|||
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
|
||||
github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
|
||||
github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
|
||||
github.com/gin-contrib/cors v1.5.0 h1:DgGKV7DDoOn36DFkNtbHrjoRiT5ExCe+PC9/xp7aKvk=
|
||||
github.com/gin-contrib/cors v1.5.0/go.mod h1:TvU7MAZ3EwrPLI2ztzTt3tqgvBCq+wn8WpZmfADjupI=
|
||||
github.com/gin-contrib/gzip v0.0.6 h1:NjcunTcGAj5CO1gn4N8jHOSIeRFHIbn51z6K+xaN4d4=
|
||||
github.com/gin-contrib/gzip v0.0.6/go.mod h1:QOJlmV2xmayAjkNS2Y8NQsMneuRShOU/kjovCXNuzzk=
|
||||
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
|
||||
|
|
|
@ -19,7 +19,6 @@ import (
|
|||
"git.beisel.it/florian/hostname-service/auth"
|
||||
"git.beisel.it/florian/hostname-service/docs"
|
||||
"git.beisel.it/florian/hostname-service/middleware"
|
||||
"github.com/gin-contrib/cors"
|
||||
"github.com/gin-gonic/gin"
|
||||
swaggerFiles "github.com/swaggo/files"
|
||||
ginSwagger "github.com/swaggo/gin-swagger"
|
||||
|
@ -28,14 +27,7 @@ import (
|
|||
|
||||
func New() *gin.Engine {
|
||||
gin.SetMode(gin.DebugMode)
|
||||
|
||||
router := gin.Default()
|
||||
// // Configure CORS
|
||||
config := cors.DefaultConfig()
|
||||
config.AllowOrigins = []string{"http://localhost:3000", "http://localhost:8080", "*"} // Set to your frontend's URL
|
||||
config.AllowMethods = []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"}
|
||||
config.AllowHeaders = []string{"Origin", "Content-Type", "Authorization"}
|
||||
router.Use(cors.New(config))
|
||||
|
||||
docs.SwaggerInfo.Host = "localhost:8080"
|
||||
docs.SwaggerInfo.BasePath = "/api/v1"
|
||||
|
@ -70,8 +62,7 @@ func New() *gin.Engine {
|
|||
authenticated.GET("/:category", api.ListHostnamesByCategory)
|
||||
|
||||
// List available Rules
|
||||
authenticated.GET("/rules", api.ListAvailableRules)
|
||||
authenticated.GET("/rules/:rule", api.GetRuleStruct)
|
||||
authenticated.GET("/api/rules", api.ListAvailableRules)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
package rules
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log"
|
||||
|
||||
|
@ -60,11 +59,3 @@ func (br *BaseRule) baseUpdate(rule HostnameRule, category string, oldhostname s
|
|||
|
||||
return newHostname, nil
|
||||
}
|
||||
|
||||
func StructToJSON(v interface{}) (string, error) {
|
||||
bytes, err := json.Marshal(v)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return string(bytes), nil
|
||||
}
|
||||
|
|
|
@ -66,32 +66,32 @@ func (nr *NotebookRule) Generate(params map[string]interface{}) (string, []byte,
|
|||
return hostname, paramsJSON, nil
|
||||
}
|
||||
|
||||
// @Summary Generate hostname for category "notebook"
|
||||
// @Description Generates a hostname for a notebook based on dynamic rules.
|
||||
// @ID insert-notebook-hostname
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Tags Generating Hostnames
|
||||
// @Param body body NotebookRuleInput true "Input data to generate hostname"
|
||||
// @Success 200 {object} models.SimpleHostnameResponse "Hostname"
|
||||
// @Router /api/notebook [post]
|
||||
// @Security Bearer
|
||||
// @Summary Generate hostname for category "notebook"
|
||||
// @Description Generates a hostname for a notebook based on dynamic rules.
|
||||
// @ID insert-notebook-hostname
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Tags Generating Hostnames
|
||||
// @Param body body NotebookRuleInput true "Input data to generate hostname"
|
||||
// @Success 200 {object} models.SimpleHostnameResponse "Hostname"
|
||||
// @Router /api/notebook [post]
|
||||
// @Security Bearer
|
||||
func (nr *NotebookRule) Insert(category string, params map[string]interface{}) (string, error) {
|
||||
// Generate the hostname
|
||||
|
||||
return nr.baseInsert(nr, category, params)
|
||||
}
|
||||
|
||||
// @Summary Update hostname for category "notebook"
|
||||
// @Description Generates a new hostname for a notebook based on dynamic rules.
|
||||
// @ID update-notebook-hostname
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Tags Manipulate existing Hostnames
|
||||
// @Param body body NotebookRuleInput true "Input data to generate hostname"
|
||||
// @Success 200 {object} models.SimpleHostnameResponse "Hostname"
|
||||
// @Router /api/notebook [put]
|
||||
// @Security Bearer
|
||||
// @Summary Update hostname for category "notebook"
|
||||
// @Description Generates a new hostname for a notebook based on dynamic rules.
|
||||
// @ID update-notebook-hostname
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Tags Manipulate existing Hostnames
|
||||
// @Param body body NotebookRuleInput true "Input data to generate hostname"
|
||||
// @Success 200 {object} models.SimpleHostnameResponse "Hostname"
|
||||
// @Router /api/notebook [put]
|
||||
// @Security Bearer
|
||||
func (nr *NotebookRule) Update(category string, oldhostname string, params map[string]interface{}) (string, error) {
|
||||
return nr.baseUpdate(nr, category, oldhostname, params)
|
||||
}
|
||||
|
|
|
@ -108,32 +108,32 @@ func (sr *ServerRule) Generate(params map[string]interface{}) (string, []byte, e
|
|||
|
||||
}
|
||||
|
||||
// @Summary Generate hostname for category "notebook"
|
||||
// @Description Generates a hostname for a notebook based on dynamic rules.
|
||||
// @ID insert-server-hostname
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Tags Generating Hostnames
|
||||
// @Param body body ServerRuleInput true "Input data to generate hostname"
|
||||
// @Success 200 {object} models.SimpleHostnameResponse "Hostname"
|
||||
// @Router /api/server [post]
|
||||
// @Security Bearer
|
||||
// @Summary Generate hostname for category "notebook"
|
||||
// @Description Generates a hostname for a notebook based on dynamic rules.
|
||||
// @ID insert-server-hostname
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Tags Generating Hostnames
|
||||
// @Param body body ServerRuleInput true "Input data to generate hostname"
|
||||
// @Success 200 {object} models.SimpleHostnameResponse "Hostname"
|
||||
// @Router /api/server [post]
|
||||
// @Security Bearer
|
||||
func (nr *ServerRule) Insert(category string, params map[string]interface{}) (string, error) {
|
||||
// Generate the hostname
|
||||
|
||||
return nr.baseInsert(nr, category, params)
|
||||
}
|
||||
|
||||
// @Summary Update hostname for category "notebook"
|
||||
// @Description Generates a new hostname for a notebook based on dynamic rules.
|
||||
// @ID update-server-hostname
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Tags Manipulate existing Hostnames
|
||||
// @Param body body ServerRuleInput true "Input data to generate hostname"
|
||||
// @Success 200 {object} models.SimpleHostnameResponse "Hostname"
|
||||
// @Router /api/server [put]
|
||||
// @Security Bearer
|
||||
// @Summary Update hostname for category "notebook"
|
||||
// @Description Generates a new hostname for a notebook based on dynamic rules.
|
||||
// @ID update-server-hostname
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Tags Manipulate existing Hostnames
|
||||
// @Param body body ServerRuleInput true "Input data to generate hostname"
|
||||
// @Success 200 {object} models.SimpleHostnameResponse "Hostname"
|
||||
// @Router /api/server [put]
|
||||
// @Security Bearer
|
||||
func (nr *ServerRule) Update(category string, oldhostname string, params map[string]interface{}) (string, error) {
|
||||
return nr.baseUpdate(nr, category, oldhostname, params)
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue