Skip to content

35 remove pkg folders from frontends #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vegardb merged 6 commits into from
Jun 30, 2026
Merged

35 remove pkg folders from frontends #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a81304d
move jsonfrontend pkg folder to internal, as it should not be used by…
vegardb Jun 24, 2026
9c61c6e
move moxfrontend pkg folder contents to internal
vegardb Jun 24, 2026
306385c
move xmlfrontend pkg folder contents to internal
vegardb Jun 24, 2026
029a1fe
move jsonfrontend into pkg directory
vegardb Jun 24, 2026
5f7c714
fix build
vegardb Jun 24, 2026
ea80afc
Merge branch 'main' into 35-remove-pkg-folders-from-frontends
vegardb Jun 30, 2026
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
1 change: 0 additions & 1 deletion healthz/build/package/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion jsonfrontend/internal/server/encode/encode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
1 change: 0 additions & 1 deletion moxfrontend/build/package/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ./...

Expand Down
0 moxfrontend/pkg/mox/mox.go → moxfrontend/internal/mox/mox.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion moxfrontend/internal/server/encode/encode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion moxfrontend/internal/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
1 change: 0 additions & 1 deletion xmlfrontend/build/package/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ./...

Expand Down
2 changes: 1 addition & 1 deletion xmlfrontend/internal/server/encode/dataelement.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion xmlfrontend/internal/server/encode/encode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion xmlfrontend/internal/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
0 xmlfrontend/pkg/xmlformat/xmlformat.go → xmlfrontend/internal/xmlformat/xmlformat.go
View file
Open in desktop
File renamed without changes.
Loading