Skip to content
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 104 additions & 0 deletions .github/workflows/unit_test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
name: Console Go Test

on:
pull_request:
branches: [ "main" ]

defaults:
run:
shell: bash

jobs:
build:
runs-on: ubuntu-latest
env:
GO_VERSION: 1.23.4
NODEJS_VERSION: 16.20.2
steps:
- name: Checkout current repository
uses: actions/checkout@v4
with:
fetch-depth: 0
path: console

- name: Checkout framework repository
uses: actions/checkout@v4
with:
fetch-depth: 0
repository: infinilabs/framework
path: framework


- name: Checkout framework-vendor
uses: actions/checkout@v4
with:
ref: main
fetch-depth: 0
repository: infinilabs/framework-vendor
path: vendor

- name: Set up nodejs toolchain
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODEJS_VERSION }}

- name: Cache dependencies
uses: actions/cache@v4
with:
path: |
node_modules
key: ${{ runner.os }}-cnpm-${{ hashFiles('**/package.json') }}
restore-keys: |
${{ runner.os }}-cnpm-

- name: Check nodejs toolchain
run: |
if ! command -v cnpm >/dev/null 2>&1; then
npm install -g rimraf --quiet --no-progress
npm install -g [email protected] --quiet --no-progress
fi
node -v && npm -v && cnpm -v

- name: Set up go toolchain
uses: actions/setup-go@v5
with:
go-version: ${{ env.GO_VERSION }}
check-latest: false
cache: true

- name: Check go toolchain
run: go version

- name: Cache Build Output
uses: actions/cache@v4
with:
path: |
.public
key: ${{ runner.os }}-build-${{ hashFiles('**/package.json') }}-${{ github.sha }}
restore-keys: |
${{ runner.os }}-build-${{ hashFiles('**/package.json') }}-
${{ runner.os }}-build-

- name: Test console code
run: |
echo Home path is $HOME
export WORKBASE=$HOME/go/src/infini.sh
export WORK=$WORKBASE/console

# for console web
cd $GITHUB_WORKSPACE/console/web
cnpm install --quiet --no-progress
cnpm run build --quiet

# for test workspace
mkdir -p $HOME/go/src/
ln -s $GITHUB_WORKSPACE $WORKBASE

# check work folder
ls -lrt $WORKBASE/
ls -alrt $WORK

# for unit test
cd $WORKBASE/console
echo Testing code at $PWD ...
make config test
14 changes: 7 additions & 7 deletions plugin/api/insight/metric_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (
"strconv"
"strings"

"infini.sh/framework/core/elastic"
"infini.sh/console/model/insight"
"infini.sh/framework/core/elastic"
"infini.sh/framework/core/util"
)

Expand Down Expand Up @@ -107,7 +107,7 @@ func GenerateQuery(metric *insight.Metric) (interface{}, error) {
i := 0
for _, metricItem := range metric.Items {
if metricItem.Name == "" {
metricItem.Name = string('a' + i)
metricItem.Name = string(rune('a' + i))
}
metricAggs := generateAgg(&metricItem, metric.TimeField)
if err := util.MergeFields(basicAggs, metricAggs, true); err != nil {
Expand Down Expand Up @@ -156,7 +156,7 @@ func GenerateQuery(metric *insight.Metric) (interface{}, error) {
"field": groups[i].Field,
"size": limit,
}
if i == grpLength - 1 && len(metric.Sort) > 0 {
if i == grpLength-1 && len(metric.Sort) > 0 {
var termsOrder []interface{}
for _, sortItem := range metric.Sort {
termsOrder = append(termsOrder, util.MapStr{sortItem.Key: sortItem.Direction})
Expand Down Expand Up @@ -244,7 +244,7 @@ func collectMetricData(agg interface{}, groupValues []string, metricData *[]insi
if timeBks, ok := aggM["time_buckets"].(map[string]interface{}); ok {
if bks, ok := timeBks["buckets"].([]interface{}); ok {
md := insight.MetricData{
Data: map[string][]insight.MetricDataItem{},
Data: map[string][]insight.MetricDataItem{},
Groups: groupValues,
}
for _, bk := range bks {
Expand All @@ -268,7 +268,7 @@ func collectMetricData(agg interface{}, groupValues []string, metricData *[]insi

} else {
md := insight.MetricData{
Data: map[string][]insight.MetricDataItem{},
Data: map[string][]insight.MetricDataItem{},
Groups: groupValues,
}
for k, v := range aggM {
Expand Down Expand Up @@ -307,7 +307,7 @@ func collectMetricDataOther(agg interface{}, groupValues []string, metricData *[
if timeBks, ok := aggM["time_buckets"].(map[string]interface{}); ok {
if bks, ok := timeBks["buckets"].([]interface{}); ok {
md := insight.MetricData{
Data: map[string][]insight.MetricDataItem{},
Data: map[string][]insight.MetricDataItem{},
Groups: groupValues,
}
for _, bk := range bks {
Expand All @@ -332,7 +332,7 @@ func collectMetricDataOther(agg interface{}, groupValues []string, metricData *[
}
} else {
md := insight.MetricData{
Data: map[string][]insight.MetricDataItem{},
Data: map[string][]insight.MetricDataItem{},
Groups: groupValues,
}

Expand Down
Loading