Merge pull request #904 from NdoleStudio/feat/migrate-nuxt4-vuetify4 · zshmeta/httpsms@cd8856b · GitHub
Skip to content

Commit cd8856b

Browse files
AchoArnoldAchoArnold
authored
Merge pull request NdoleStudio#904 from NdoleStudio/feat/migrate-nuxt4-vuetify4
feat(web): migrate frontend to Nuxt 4 + Vue 3 + Vuetify 4
2 parents f3e5847 + dc0c4f5 commit cd8856b

196 files changed

Lines changed: 23817 additions & 30584 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/web.yml‎

Lines changed: 7 additions & 8 deletions

‎.pre-commit-config.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
repos:
22
- repo: https://github.com/tekwizely/pre-commit-golang
3-
rev: v1.0.0-rc.1
3+
rev: v1.0.0-rc.4
44
hooks:
55
- id: go-fumpt
66
- id: go-mod-tidy
77
- id: go-lint
88
- id: go-imports
99
- repo: https://github.com/pre-commit/pre-commit-hooks
10-
rev: v4.4.0
10+
rev: v6.0.0
1111
hooks:
1212
- id: check-yaml
1313
- id: end-of-file-fixer
1414
- id: trailing-whitespace
1515

1616
- repo: https://github.com/pre-commit/mirrors-prettier
17-
rev: v3.1.0
17+
rev: v4.0.0-alpha.8
1818
hooks:
1919
- id: prettier
2020
exclude: ^web/

‎api/docs/docs.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3348,6 +3348,7 @@ const docTemplate = `{
33483348
"required": [
33493349
"created_at",
33503350
"delivered_count",
3351+
"expired_count",
33513352
"failed_count",
33523353
"pending_count",
33533354
"request_id",
@@ -3364,6 +3365,10 @@ const docTemplate = `{
33643365
"type": "integer",
33653366
"example": 25
33663367
},
3368+
"expired_count": {
3369+
"type": "integer",
3370+
"example": 3
3371+
},
33673372
"failed_count": {
33683373
"type": "integer",
33693374
"example": 5
@@ -3374,7 +3379,7 @@ const docTemplate = `{
33743379
},
33753380
"request_id": {
33763381
"type": "string",
3377-
"example": "bulk-32343a19-da5e-4b1b-a767-3298a73703cb"
3382+
"example": "bulk-csv-a1B2c3D4e5"
33783383
},
33793384
"scheduled_count": {
33803385
"type": "integer",

‎api/docs/swagger.json‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3345,6 +3345,7 @@
33453345
"required": [
33463346
"created_at",
33473347
"delivered_count",
3348+
"expired_count",
33483349
"failed_count",
33493350
"pending_count",
33503351
"request_id",
@@ -3361,6 +3362,10 @@
33613362
"type": "integer",
33623363
"example": 25
33633364
},
3365+
"expired_count": {
3366+
"type": "integer",
3367+
"example": 3
3368+
},
33643369
"failed_count": {
33653370
"type": "integer",
33663371
"example": 5
@@ -3371,7 +3376,7 @@
33713376
},
33723377
"request_id": {
33733378
"type": "string",
3374-
"example": "bulk-32343a19-da5e-4b1b-a767-3298a73703cb"
3379+
"example": "bulk-csv-a1B2c3D4e5"
33753380
},
33763381
"scheduled_count": {
33773382
"type": "integer",
@@ -5367,4 +5372,4 @@
53675372
"in": "header"
53685373
}
53695374
}
5370-
}
5375+
}

‎api/docs/swagger.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,17 @@ definitions:
4848
delivered_count:
4949
example: 25
5050
type: integer
51+
expired_count:
52+
example: 3
53+
type: integer
5154
failed_count:
5255
example: 5
5356
type: integer
5457
pending_count:
5558
example: 30
5659
type: integer
5760
request_id:
58-
example: bulk-32343a19-da5e-4b1b-a767-3298a73703cb
61+
example: bulk-csv-a1B2c3D4e5
5962
type: string
6063
scheduled_count:
6164
example: 50
@@ -69,6 +72,7 @@ definitions:
6972
required:
7073
- created_at
7174
- delivered_count
75+
- expired_count
7276
- failed_count
7377
- pending_count
7478
- request_id

‎api/pkg/di/container.go‎

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"strings"
1212
"time"
1313

14+
"cloud.google.com/go/compute/metadata"
1415
"github.com/NdoleStudio/httpsms/docs"
1516
plunk "github.com/NdoleStudio/plunk-go"
1617
"github.com/pusher/pusher-http-go/v5"
@@ -1015,8 +1016,7 @@ func (container *Container) OtelResources(version string, namespace string) *res
10151016
semconv.SchemaURL,
10161017
semconv.ServiceNameKey.String(namespace),
10171018
semconv.ServiceVersionKey.String(version),
1018-
semconv.ServiceInstanceIDKey.String(hostName()),
1019-
semconv.HostNameKey.String(hostName()),
1019+
semconv.ServiceInstanceIDKey.String(instanceID()),
10201020
semconv.DeploymentEnvironmentKey.String(os.Getenv("ENV")),
10211021
)
10221022
}
@@ -1914,7 +1914,7 @@ func (container *Container) initializeUptraceProvider(version string, namespace
19141914

19151915
func logger(skipFrameCount int) telemetry.Logger {
19161916
fields := map[string]string{
1917-
"hostname": hostName(),
1917+
string(semconv.ServiceInstanceIDKey): instanceID(),
19181918
string(semconv.DeploymentEnvironmentKey): os.Getenv("ENV"),
19191919
}
19201920

@@ -1933,32 +1933,6 @@ func logDriver(skipFrameCount int) *zerodriver.Logger {
19331933
return axiomLogger(skipFrameCount)
19341934
}
19351935

1936-
func jsonLogger(skipFrameCount int) *zerodriver.Logger {
1937-
logLevel := zerolog.DebugLevel
1938-
zerolog.SetGlobalLevel(logLevel)
1939-
1940-
// See: https://cloud.google.com/logging/docs/reference/v2/rest/v2/LogEntry#LogSeverity
1941-
logLevelSeverity := map[zerolog.Level]string{
1942-
zerolog.TraceLevel: "DEFAULT",
1943-
zerolog.DebugLevel: "DEBUG",
1944-
zerolog.InfoLevel: "INFO",
1945-
zerolog.WarnLevel: "WARNING",
1946-
zerolog.ErrorLevel: "ERROR",
1947-
zerolog.PanicLevel: "CRITICAL",
1948-
zerolog.FatalLevel: "CRITICAL",
1949-
}
1950-
1951-
zerolog.LevelFieldName = "severity"
1952-
zerolog.LevelFieldMarshalFunc = func(l zerolog.Level) string {
1953-
return logLevelSeverity[l]
1954-
}
1955-
zerolog.TimestampFieldName = "time"
1956-
zerolog.TimeFieldFormat = time.RFC3339Nano
1957-
1958-
zl := zerolog.New(os.Stderr).With().Timestamp().CallerWithSkipFrameCount(skipFrameCount).Logger()
1959-
return &zerodriver.Logger{Logger: &zl}
1960-
}
1961-
19621936
func axiomLogger(skipFrameCount int) *zerodriver.Logger {
19631937
axiomWriter, err := axiomzerolog.New(
19641938
axiomzerolog.SetLevels([]zerolog.Level{zerolog.TraceLevel, zerolog.DebugLevel, zerolog.InfoLevel, zerolog.WarnLevel, zerolog.ErrorLevel, zerolog.PanicLevel, zerolog.FatalLevel, zerolog.NoLevel}),
@@ -1972,14 +1946,25 @@ func axiomLogger(skipFrameCount int) *zerodriver.Logger {
19721946
return &zerodriver.Logger{Logger: &zl}
19731947
}
19741948

1975-
func hostName() string {
1949+
func instanceID() string {
19761950
h, err := os.Hostname()
19771951
if err != nil {
19781952
h = strconv.Itoa(os.Getpid())
19791953
}
1954+
if metadata.OnGCE() {
1955+
return getGCEInstanceID(h)
1956+
}
19801957
return h
19811958
}
19821959

1960+
func getGCEInstanceID(hostname string) string {
1961+
instanceID, err := metadata.InstanceIDWithContext(context.Background())
1962+
if err != nil {
1963+
return hostname
1964+
}
1965+
return instanceID
1966+
}
1967+
19831968
func consoleLogger(skipFrameCount int) *zerodriver.Logger {
19841969
l := zerolog.New(
19851970
zerolog.ConsoleWriter{

‎api/pkg/entities/bulk_message.go‎

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)