add config tags

add git branch to config tags

Author: marle3003

api/handler_config.go

@@ -2,13 +2,14 @@ package api
 
 import (
 	"fmt"
-	log "github.com/sirupsen/logrus"
 	"mime"
 	"mokapi/config/dynamic"
 	"net/http"
 	"path/filepath"
 	"strings"
 	"time"
+
+	log "github.com/sirupsen/logrus"
 )
 
 type config struct {
@@ -17,6 +18,7 @@ type config struct {
 	Provider string      `json:"provider"`
 	Time     time.Time   `json:"time"`
 	Refs     []configRef `json:"refs,omitempty"`
+	Tags     []string    `json:"tags,omitempty"`
 }
 
 type configRef struct {
@@ -116,5 +118,6 @@ func toConfig(cfg *dynamic.Config) config {
 		Time:     cfg.Info.Time,
 		Provider: cfg.Info.Provider,
 		Refs:     refs,
+		Tags:     cfg.Info.Tags,
 	}
 }

config/dynamic/config_info.go

@@ -3,11 +3,12 @@ package dynamic
 import (
 	"crypto/md5"
 	"encoding/hex"
-	"github.com/google/uuid"
-	log "github.com/sirupsen/logrus"
 	"net/url"
 	"strings"
 	"time"
+
+	"github.com/google/uuid"
+	log "github.com/sirupsen/logrus"
 )
 
 type ConfigInfo struct {
@@ -16,6 +17,7 @@ type ConfigInfo struct {
 	Checksum []byte
 	Time     time.Time
 	inner    *ConfigInfo
+	Tags     []string
 }
 
 func (ci *ConfigInfo) Path() string {

config/dynamic/provider/git/git.go

@@ -329,6 +329,11 @@ func wrapConfig(c *dynamic.Config, r *repository) {
 		// to query git log takes too long
 		Time: time.Now(),
 	}
+	h, err := r.repo.Head()
+	if err == nil {
+		ref := h.Name()
+		info.Tags = append(info.Tags, ref.Short())
+	}
 
 	dynamic.Wrap(info, c)
 }

config/dynamic/provider/git/git_test.go

@@ -55,6 +55,7 @@ func TestGit(t *testing.T) {
 						require.Equal(t, "https://github.com/marle3003/mokapi-example.git?file=/"+name, c.Config.Info.Path())
 						require.Contains(t, gitFiles, name)
 						require.NotNil(t, c.Config.Info.Checksum)
+						require.Equal(t, []string{"main"}, c.Config.Info.Tags)
 					}
 				}
 				require.Equal(t, 4, count)

examples/mokapi/services_http.js

@@ -112,7 +112,8 @@ export const configs = {
                 data: 'http://localhost:8090/api/services/http/Swagger%20Petstore',
             }
         ],
-        filename: 'petstore.json'
+        filename: 'petstore.json',
+        tags: ['Tag1', 'Tag2'],
     },
     'b6fea8ac-56c7-4e73-a9c0-4487640bdca8': {
         id: 'b6fea8ac-56c7-4e73-a9c0-4487640bdca8',

webui/src/components/dashboard/Config.vue

@@ -65,12 +65,15 @@ const provider = computed(() => {
             <section class="card" aria-label="Info">
                 <div class="card-body">
                     <div class="row">
-                        <div class="col-11 header mb-3">
+                        <div class="col header mb-3">
                             <p id="url" class="label">URL</p>
                             <p aria-labelledby="url">{{ config.url }}</p>
                         </div>
-                        <div class="col-1 text-end">
-                            <span class="badge bg-secondary">Config</span>
+                        <div class="col text-end">
+                            <span v-if="config.tags" v-for="tag of config.tags" class="badge bg-primary ms-1">
+                                {{ tag }}
+                            </span>
+                            <span class="badge bg-secondary ms-1">Config</span>
                         </div>
                     </div>
                     <div class="row">

webui/src/types/service.d.ts

@@ -39,6 +39,7 @@ declare interface Config {
     provider: string
     time: string
     refs: ConfigRef[]
+    tags?: string[]
 }
 
 declare interface ConfigRef {