Merge pull request #37 from metno/35-remove-pkg-folders-from-frontends

vegardb · web-flow · commit 036ac068ff5b · 2026-06-30T14:48:47.000+02:00
35 remove pkg folders from frontends
diff --git a/healthz/build/package/Dockerfile b/healthz/build/package/Dockerfile
@@ -6,7 +6,6 @@ WORKDIR /src
 RUN go mod download
 
 COPY jsonfrontend/pkg/ /src/jsonfrontend/pkg/
-COPY xmlfrontend/pkg/ /src/xmlfrontend/pkg/
 COPY internal/internalprotocol /src/internal/internalprotocol
 
 COPY healthz /src/healthz
diff --git a/jsonfrontend/internal/server/encode/encode.go b/jsonfrontend/internal/server/encode/encode.go
@@ -5,9 +5,9 @@ import (
 	"time"
 
 	"github.com/metno/forti/internal/internalprotocol"
+	"github.com/metno/forti/internal/radar"
 	"github.com/metno/forti/jsonfrontend/internal/server/config"
 	"github.com/metno/forti/jsonfrontend/pkg/jsonformat"
-	"github.com/metno/forti/internal/radar"
 	"github.com/metno/go-weathersymbol"
 )
 
diff --git a/moxfrontend/build/package/Dockerfile b/moxfrontend/build/package/Dockerfile
@@ -7,7 +7,6 @@ RUN go mod download
 
 COPY internal/internalprotocol /src/internal/internalprotocol
 COPY moxfrontend/internal /src/moxfrontend/internal
-COPY moxfrontend/pkg /src/moxfrontend/pkg
 
 RUN go test ./...
 
diff --git a/moxfrontend/internal/mox/mox.go b/moxfrontend/internal/mox/mox.go
diff --git a/moxfrontend/internal/server/encode/encode.go b/moxfrontend/internal/server/encode/encode.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/metno/forti/internal/internalprotocol"
-	"github.com/metno/forti/moxfrontend/pkg/mox"
+	"github.com/metno/forti/moxfrontend/internal/mox"
 )
 
 func EncodeNoData() *mox.ForecastDocument {
diff --git a/moxfrontend/internal/server/server.go b/moxfrontend/internal/server/server.go
@@ -12,8 +12,8 @@ import (
 	"time"
 
 	"github.com/metno/forti/internal/internalprotocol"
+	"github.com/metno/forti/moxfrontend/internal/mox"
 	"github.com/metno/forti/moxfrontend/internal/server/encode"
-	"github.com/metno/forti/moxfrontend/pkg/mox"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 )
diff --git a/xmlfrontend/build/package/Dockerfile b/xmlfrontend/build/package/Dockerfile
@@ -7,7 +7,6 @@ RUN go mod download
 
 COPY internal/ /src/internal/
 COPY xmlfrontend/internal /src/xmlfrontend/internal
-COPY xmlfrontend/pkg /src/xmlfrontend/pkg
 
 RUN go test ./...
 
diff --git a/xmlfrontend/internal/server/encode/dataelement.go b/xmlfrontend/internal/server/encode/dataelement.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 
 	"github.com/metno/forti/xmlfrontend/internal/server/config"
-	"github.com/metno/forti/xmlfrontend/pkg/xmlformat"
+	"github.com/metno/forti/xmlfrontend/internal/xmlformat"
 )
 
 func newDataElement(data *config.Parameter, value float32, allValues *map[string]float32) (xmlformat.DataElement, error) {
diff --git a/xmlfrontend/internal/server/encode/encode.go b/xmlfrontend/internal/server/encode/encode.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/metno/forti/internal/internalprotocol"
 	"github.com/metno/forti/xmlfrontend/internal/server/config"
-	"github.com/metno/forti/xmlfrontend/pkg/xmlformat"
+	"github.com/metno/forti/xmlfrontend/internal/xmlformat"
 )
 
 func Encode(location *internalprotocol.GetForecastRequest, forecast *internalprotocol.Forecast) *xmlformat.ForecastDocument {
diff --git a/xmlfrontend/internal/server/server.go b/xmlfrontend/internal/server/server.go
@@ -16,7 +16,7 @@ import (
 	"github.com/metno/forti/internal/radar"
 	"github.com/metno/forti/xmlfrontend/internal/server/config"
 	"github.com/metno/forti/xmlfrontend/internal/server/encode"
-	"github.com/metno/forti/xmlfrontend/pkg/xmlformat"
+	"github.com/metno/forti/xmlfrontend/internal/xmlformat"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 )
diff --git a/xmlfrontend/internal/xmlformat/xmlformat.go b/xmlfrontend/internal/xmlformat/xmlformat.go

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ import (`
`5`	`5`	`"time"`
`6`	`6`
`7`	`7`	`"github.com/metno/forti/internal/internalprotocol"`
	`8`	`+ "github.com/metno/forti/internal/radar"`
`8`	`9`	`"github.com/metno/forti/jsonfrontend/internal/server/config"`
`9`	`10`	`"github.com/metno/forti/jsonfrontend/pkg/jsonformat"`
`10`		`- "github.com/metno/forti/internal/radar"`
`11`	`11`	`"github.com/metno/go-weathersymbol"`
`12`	`12`	`)`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"time"`
`8`	`8`
`9`	`9`	`"github.com/metno/forti/internal/internalprotocol"`
`10`		`- "github.com/metno/forti/moxfrontend/pkg/mox"`
	`10`	`+ "github.com/metno/forti/moxfrontend/internal/mox"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func EncodeNoData() *mox.ForecastDocument {`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ import (`
`12`	`12`	`"time"`
`13`	`13`
`14`	`14`	`"github.com/metno/forti/internal/internalprotocol"`
	`15`	`+ "github.com/metno/forti/moxfrontend/internal/mox"`
`15`	`16`	`"github.com/metno/forti/moxfrontend/internal/server/encode"`
`16`		`- "github.com/metno/forti/moxfrontend/pkg/mox"`
`17`	`17`	`"google.golang.org/grpc"`
`18`	`18`	`"google.golang.org/grpc/credentials/insecure"`
`19`	`19`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"strconv"`
`7`	`7`
`8`	`8`	`"github.com/metno/forti/xmlfrontend/internal/server/config"`
`9`		`- "github.com/metno/forti/xmlfrontend/pkg/xmlformat"`
	`9`	`+ "github.com/metno/forti/xmlfrontend/internal/xmlformat"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`func newDataElement(data config.Parameter, value float32, allValues map[string]float32) (xmlformat.DataElement, error) {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`
`11`	`11`	`"github.com/metno/forti/internal/internalprotocol"`
`12`	`12`	`"github.com/metno/forti/xmlfrontend/internal/server/config"`
`13`		`- "github.com/metno/forti/xmlfrontend/pkg/xmlformat"`
	`13`	`+ "github.com/metno/forti/xmlfrontend/internal/xmlformat"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`func Encode(location internalprotocol.GetForecastRequest, forecast internalprotocol.Forecast) *xmlformat.ForecastDocument {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`	`"github.com/metno/forti/internal/radar"`
`17`	`17`	`"github.com/metno/forti/xmlfrontend/internal/server/config"`
`18`	`18`	`"github.com/metno/forti/xmlfrontend/internal/server/encode"`
`19`		`- "github.com/metno/forti/xmlfrontend/pkg/xmlformat"`
	`19`	`+ "github.com/metno/forti/xmlfrontend/internal/xmlformat"`
`20`	`20`	`"google.golang.org/grpc"`
`21`	`21`	`"google.golang.org/grpc/credentials/insecure"`
`22`	`22`	`)`