From a81304db95c1e688407b9e441c146b7b2cca65fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vegard=20B=C3=B8nes?= Date: Wed, 24 Jun 2026 10:13:45 +0200 Subject: [PATCH 1/5] move jsonfrontend pkg folder to internal, as it should not be used by externals --- jsonfrontend/{pkg => internal}/jsonformat/geojson.go | 0 jsonfrontend/{pkg => internal}/jsonformat/json.go | 0 jsonfrontend/internal/server/encode/encode.go | 4 ++-- jsonfrontend/internal/server/server.go | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename jsonfrontend/{pkg => internal}/jsonformat/geojson.go (100%) rename jsonfrontend/{pkg => internal}/jsonformat/json.go (100%) diff --git a/jsonfrontend/pkg/jsonformat/geojson.go b/jsonfrontend/internal/jsonformat/geojson.go similarity index 100% rename from jsonfrontend/pkg/jsonformat/geojson.go rename to jsonfrontend/internal/jsonformat/geojson.go diff --git a/jsonfrontend/pkg/jsonformat/json.go b/jsonfrontend/internal/jsonformat/json.go similarity index 100% rename from jsonfrontend/pkg/jsonformat/json.go rename to jsonfrontend/internal/jsonformat/json.go diff --git a/jsonfrontend/internal/server/encode/encode.go b/jsonfrontend/internal/server/encode/encode.go index ac8a675..31c8d42 100644 --- 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/jsonfrontend/internal/server/config" - "github.com/metno/forti/jsonfrontend/pkg/jsonformat" "github.com/metno/forti/internal/radar" + "github.com/metno/forti/jsonfrontend/internal/jsonformat" + "github.com/metno/forti/jsonfrontend/internal/server/config" "github.com/metno/go-weathersymbol" ) diff --git a/jsonfrontend/internal/server/server.go b/jsonfrontend/internal/server/server.go index b976555..456e3df 100644 --- a/jsonfrontend/internal/server/server.go +++ b/jsonfrontend/internal/server/server.go @@ -16,10 +16,10 @@ import ( "time" "github.com/metno/forti/internal/internalprotocol" + "github.com/metno/forti/jsonfrontend/internal/jsonformat" "github.com/metno/forti/jsonfrontend/internal/server/config" "github.com/metno/forti/jsonfrontend/internal/server/encode" "github.com/metno/forti/jsonfrontend/internal/server/metrics" - "github.com/metno/forti/jsonfrontend/pkg/jsonformat" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) From 9c61c6e3fb246b4dbb1024432d34e8136d737d66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vegard=20B=C3=B8nes?= Date: Wed, 24 Jun 2026 10:26:50 +0200 Subject: [PATCH 2/5] move moxfrontend pkg folder contents to internal --- moxfrontend/{pkg => internal}/mox/mox.go | 0 moxfrontend/internal/server/encode/encode.go | 2 +- moxfrontend/internal/server/server.go | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename moxfrontend/{pkg => internal}/mox/mox.go (100%) diff --git a/moxfrontend/pkg/mox/mox.go b/moxfrontend/internal/mox/mox.go similarity index 100% rename from moxfrontend/pkg/mox/mox.go rename to moxfrontend/internal/mox/mox.go diff --git a/moxfrontend/internal/server/encode/encode.go b/moxfrontend/internal/server/encode/encode.go index 1ced43e..b25d09a 100644 --- 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 index 82113f9..679ca1a 100644 --- 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" ) From 306385cc339808a58924b73da8f7c68de577d852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vegard=20B=C3=B8nes?= Date: Wed, 24 Jun 2026 10:27:20 +0200 Subject: [PATCH 3/5] move xmlfrontend pkg folder contents to internal --- xmlfrontend/internal/server/encode/dataelement.go | 2 +- xmlfrontend/internal/server/encode/encode.go | 2 +- xmlfrontend/internal/server/server.go | 2 +- xmlfrontend/{pkg => internal}/xmlformat/xmlformat.go | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename xmlfrontend/{pkg => internal}/xmlformat/xmlformat.go (100%) diff --git a/xmlfrontend/internal/server/encode/dataelement.go b/xmlfrontend/internal/server/encode/dataelement.go index 48ecbce..c85841b 100644 --- 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 index 5726366..1487a12 100644 --- 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 index ae5dc3a..31854bf 100644 --- 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/pkg/xmlformat/xmlformat.go b/xmlfrontend/internal/xmlformat/xmlformat.go similarity index 100% rename from xmlfrontend/pkg/xmlformat/xmlformat.go rename to xmlfrontend/internal/xmlformat/xmlformat.go From 029a1fe37ce5dba22224b549d2ec2d4dd227e7ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vegard=20B=C3=B8nes?= Date: Wed, 24 Jun 2026 11:10:59 +0200 Subject: [PATCH 4/5] move jsonfrontend into pkg directory --- jsonfrontend/internal/server/encode/encode.go | 2 +- jsonfrontend/internal/server/server.go | 2 +- jsonfrontend/{internal => pkg}/jsonformat/geojson.go | 0 jsonfrontend/{internal => pkg}/jsonformat/json.go | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename jsonfrontend/{internal => pkg}/jsonformat/geojson.go (100%) rename jsonfrontend/{internal => pkg}/jsonformat/json.go (100%) diff --git a/jsonfrontend/internal/server/encode/encode.go b/jsonfrontend/internal/server/encode/encode.go index 31c8d42..230cc65 100644 --- a/jsonfrontend/internal/server/encode/encode.go +++ b/jsonfrontend/internal/server/encode/encode.go @@ -6,8 +6,8 @@ import ( "github.com/metno/forti/internal/internalprotocol" "github.com/metno/forti/internal/radar" - "github.com/metno/forti/jsonfrontend/internal/jsonformat" "github.com/metno/forti/jsonfrontend/internal/server/config" + "github.com/metno/forti/jsonfrontend/pkg/jsonformat" "github.com/metno/go-weathersymbol" ) diff --git a/jsonfrontend/internal/server/server.go b/jsonfrontend/internal/server/server.go index 456e3df..b976555 100644 --- a/jsonfrontend/internal/server/server.go +++ b/jsonfrontend/internal/server/server.go @@ -16,10 +16,10 @@ import ( "time" "github.com/metno/forti/internal/internalprotocol" - "github.com/metno/forti/jsonfrontend/internal/jsonformat" "github.com/metno/forti/jsonfrontend/internal/server/config" "github.com/metno/forti/jsonfrontend/internal/server/encode" "github.com/metno/forti/jsonfrontend/internal/server/metrics" + "github.com/metno/forti/jsonfrontend/pkg/jsonformat" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/jsonfrontend/internal/jsonformat/geojson.go b/jsonfrontend/pkg/jsonformat/geojson.go similarity index 100% rename from jsonfrontend/internal/jsonformat/geojson.go rename to jsonfrontend/pkg/jsonformat/geojson.go diff --git a/jsonfrontend/internal/jsonformat/json.go b/jsonfrontend/pkg/jsonformat/json.go similarity index 100% rename from jsonfrontend/internal/jsonformat/json.go rename to jsonfrontend/pkg/jsonformat/json.go From 5f7c71455d0182e0ea94df4ce98c64cad4971b52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vegard=20B=C3=B8nes?= Date: Wed, 24 Jun 2026 11:21:01 +0200 Subject: [PATCH 5/5] fix build --- healthz/build/package/Dockerfile | 1 - moxfrontend/build/package/Dockerfile | 1 - xmlfrontend/build/package/Dockerfile | 1 - 3 files changed, 3 deletions(-) diff --git a/healthz/build/package/Dockerfile b/healthz/build/package/Dockerfile index af43bdd..d652320 100644 --- 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/moxfrontend/build/package/Dockerfile b/moxfrontend/build/package/Dockerfile index 7bbcfe0..dc4db3b 100644 --- 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/xmlfrontend/build/package/Dockerfile b/xmlfrontend/build/package/Dockerfile index 44ff555..411d8de 100644 --- 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 ./...