Merge pull request #25 from metno/24-move-internalprotocol-to-internal

havardf · web-flow · commit eb017ebd9420 · 2026-06-23T15:29:55.000+02:00
move internalprotocol to internal folder
diff --git a/benchmarker/build/package/Dockerfile b/benchmarker/build/package/Dockerfile
@@ -5,7 +5,7 @@ COPY go.sum /src/go.sum
 WORKDIR /src
 RUN go mod download
 
-COPY internalprotocol /src/internalprotocol
+COPY internal/internalprotocol /src/internal/internalprotocol
 COPY benchmarker/internal /src/benchmarker/internal
 
 COPY benchmarker/cmd /src/benchmarker/cmd
diff --git a/benchmarker/internal/fortigrpc/fortigrpc.go b/benchmarker/internal/fortigrpc/fortigrpc.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/metno/forti/benchmarker/internal/location"
-	"github.com/metno/forti/internalprotocol"
+	"github.com/metno/forti/internal/internalprotocol"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 )
diff --git a/correctedforecaster/build/package/Dockerfile b/correctedforecaster/build/package/Dockerfile
@@ -30,7 +30,6 @@ WORKDIR /src
 RUN go mod download
 
 COPY internal/ /src/internal/
-COPY internalprotocol /src/internalprotocol
 COPY correctedforecaster/internal/ /src/correctedforecaster/internal/
 
 RUN go test ./...
diff --git a/correctedforecaster/internal/correction/temperature_correct.go b/correctedforecaster/internal/correction/temperature_correct.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/metno/forti/internalprotocol"
+	"github.com/metno/forti/internal/internalprotocol"
 	"github.com/metno/go-weathersymbol"
 )
 
diff --git a/correctedforecaster/internal/health/health.go b/correctedforecaster/internal/health/health.go
@@ -3,7 +3,7 @@ package health
 import (
 	"context"
 
-	"github.com/metno/forti/internalprotocol"
+	"github.com/metno/forti/internal/internalprotocol"
 	"google.golang.org/grpc/health/grpc_health_v1"
 )
 
diff --git a/correctedforecaster/internal/server/server.go b/correctedforecaster/internal/server/server.go
@@ -16,7 +16,7 @@ import (
 	"github.com/metno/forti/correctedforecaster/internal/correction"
 	"github.com/metno/forti/correctedforecaster/internal/health"
 	"github.com/metno/forti/correctedforecaster/internal/lookup"
-	"github.com/metno/forti/internalprotocol"
+	"github.com/metno/forti/internal/internalprotocol"
 	"github.com/metno/forti/internal/radar"
 )
 
diff --git a/correctedforecaster/internal/server/server_test.go b/correctedforecaster/internal/server/server_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/metno/forti/internalprotocol"
+	"github.com/metno/forti/internal/internalprotocol"
 	"github.com/metno/go-weathersymbol"
 )
 
diff --git a/healthz/build/package/Dockerfile b/healthz/build/package/Dockerfile
@@ -7,7 +7,7 @@ RUN go mod download
 
 COPY jsonfrontend/pkg/ /src/jsonfrontend/pkg/
 COPY xmlfrontend/pkg/ /src/xmlfrontend/pkg/
-COPY internalprotocol/ /src/internalprotocol/
+COPY internal/internalprotocol /src/internal/internalprotocol
 
 COPY healthz /src/healthz
 
diff --git a/healthz/internal/status/status.go b/healthz/internal/status/status.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/metno/forti/internalprotocol"
+	"github.com/metno/forti/internal/internalprotocol"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 )
diff --git a/internal/internalprotocol/README.md b/internal/internalprotocol/README.md
diff --git a/internal/internalprotocol/forecaster.pb.go b/internal/internalprotocol/forecaster.pb.go
diff --git a/internal/internalprotocol/forecaster.proto b/internal/internalprotocol/forecaster.proto
@@ -0,0 +1,56 @@
+syntax = "proto3";
+
+package internalprotocol;
+
+import "google/protobuf/timestamp.proto";
+
+option go_package = "github.com/metno/forti/internal/internalprotocol";
+
+service Forecaster {
+  rpc GetForecast(GetForecastRequest) returns (Forecast) {}
+}
+
+message GetForecastRequest {
+  float latitude = 1;
+  float longitude = 2;
+  Altitude altitude = 3;
+}
+
+message Altitude {
+  float value = 1;
+  bool override = 2;
+}
+
+enum ForecastStatus {
+  OK = 0;
+  OutsideAllGrids = 1;
+  PointTooFarAway = 2;
+}
+
+message Forecast {
+  ForecastStatus forecastStatus = 1;
+
+  ForecastMeta forecastMeta = 2;
+
+  repeated ParameterMeta parameterMeta = 3;
+  repeated float data = 4;
+}
+
+message ForecastMeta {
+  google.protobuf.Timestamp updatedAt = 1;
+  google.protobuf.Timestamp nextUpdate = 2;
+
+  Location GridLocation = 3;
+}
+
+message Location {
+  float latitude = 1;
+  float longitude = 2;
+}
+
+message ParameterMeta {
+  string parameter = 1;
+  string units = 2;
+  int32 sliceFrom = 3;
+  repeated google.protobuf.Timestamp times = 4;
+}
diff --git a/internal/internalprotocol/forecaster_grpc.pb.go b/internal/internalprotocol/forecaster_grpc.pb.go
diff --git a/internal/internalprotocol/interpret.go b/internal/internalprotocol/interpret.go
diff --git a/internalprotocol/forecaster.proto b/internalprotocol/forecaster.proto
diff --git a/jsonfrontend/build/package/Dockerfile b/jsonfrontend/build/package/Dockerfile
@@ -5,7 +5,6 @@ COPY go.sum /src/go.sum
 WORKDIR /src
 RUN go mod download
 
-COPY internalprotocol /src/internalprotocol
 COPY internal/ /src/internal/
 COPY jsonfrontend/internal /src/jsonfrontend/internal
 COPY jsonfrontend/pkg /src/jsonfrontend/pkg
diff --git a/jsonfrontend/internal/server/encode/encode.go b/jsonfrontend/internal/server/encode/encode.go
@@ -4,7 +4,7 @@ import (
 	"sort"
 	"time"
 
-	"github.com/metno/forti/internalprotocol"
+	"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"
diff --git a/jsonfrontend/internal/server/encode/encode_test.go b/jsonfrontend/internal/server/encode/encode_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/metno/forti/internalprotocol"
+	"github.com/metno/forti/internal/internalprotocol"
 	"github.com/metno/forti/jsonfrontend/internal/server/config"
 	"github.com/metno/forti/jsonfrontend/pkg/jsonformat"
 
diff --git a/jsonfrontend/internal/server/server.go b/jsonfrontend/internal/server/server.go
@@ -15,7 +15,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/metno/forti/internalprotocol"
+	"github.com/metno/forti/internal/internalprotocol"
 	"github.com/metno/forti/jsonfrontend/internal/server/config"
 	"github.com/metno/forti/jsonfrontend/internal/server/encode"
 	"github.com/metno/forti/jsonfrontend/internal/server/metrics"
diff --git a/moxfrontend/build/package/Dockerfile b/moxfrontend/build/package/Dockerfile
@@ -5,7 +5,7 @@ COPY go.sum /src/go.sum
 WORKDIR /src
 RUN go mod download
 
-COPY internalprotocol /src/internalprotocol
+COPY internal/internalprotocol /src/internal/internalprotocol
 COPY moxfrontend/internal /src/moxfrontend/internal
 COPY moxfrontend/pkg /src/moxfrontend/pkg
 
diff --git a/moxfrontend/internal/server/encode/encode.go b/moxfrontend/internal/server/encode/encode.go
@@ -6,7 +6,7 @@ import (
 	"sort"
 	"time"
 
-	"github.com/metno/forti/internalprotocol"
+	"github.com/metno/forti/internal/internalprotocol"
 	"github.com/metno/forti/moxfrontend/pkg/mox"
 )
 
diff --git a/moxfrontend/internal/server/server.go b/moxfrontend/internal/server/server.go
@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/metno/forti/internalprotocol"
+	"github.com/metno/forti/internal/internalprotocol"
 	"github.com/metno/forti/moxfrontend/internal/server/encode"
 	"github.com/metno/forti/moxfrontend/pkg/mox"
 	"google.golang.org/grpc"
diff --git a/rawdataforecaster/build/package/Dockerfile b/rawdataforecaster/build/package/Dockerfile
@@ -52,7 +52,7 @@ COPY go.sum /src/go.sum
 WORKDIR /src
 RUN go mod download
 
-COPY internalprotocol /src/internalprotocol
+COPY internal/internalprotocol /src/internal/internalprotocol
 COPY rawdataforecaster/internal/ /src/rawdataforecaster/internal
 COPY rawdataforecaster/test/ /src/rawdataforecaster/test
 
diff --git a/rawdataforecaster/cmd/lookup/main.go b/rawdataforecaster/cmd/lookup/main.go
@@ -7,7 +7,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/metno/forti/internalprotocol"
+	"github.com/metno/forti/internal/internalprotocol"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 )
diff --git a/rawdataforecaster/cmd/performance/main.go b/rawdataforecaster/cmd/performance/main.go
@@ -11,7 +11,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/metno/forti/internalprotocol"
+	"github.com/metno/forti/internal/internalprotocol"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 )
diff --git a/rawdataforecaster/internal/server/server.go b/rawdataforecaster/internal/server/server.go
@@ -12,7 +12,7 @@ import (
 	"google.golang.org/grpc/health/grpc_health_v1"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
-	"github.com/metno/forti/internalprotocol"
+	"github.com/metno/forti/internal/internalprotocol"
 	"github.com/metno/forti/rawdataforecaster/internal/health"
 	"github.com/metno/forti/rawdataforecaster/internal/server/config"
 	"github.com/metno/forti/rawdataforecaster/internal/server/forecast"
diff --git a/xmlfrontend/build/package/Dockerfile b/xmlfrontend/build/package/Dockerfile
@@ -5,7 +5,6 @@ COPY go.sum /src/go.sum
 WORKDIR /src
 RUN go mod download
 
-COPY internalprotocol /src/internalprotocol
 COPY internal/ /src/internal/
 COPY xmlfrontend/internal /src/xmlfrontend/internal
 COPY xmlfrontend/pkg /src/xmlfrontend/pkg
diff --git a/xmlfrontend/internal/server/encode/encode.go b/xmlfrontend/internal/server/encode/encode.go
@@ -8,7 +8,7 @@ import (
 	"sort"
 	"time"
 
-	"github.com/metno/forti/internalprotocol"
+	"github.com/metno/forti/internal/internalprotocol"
 	"github.com/metno/forti/xmlfrontend/internal/server/config"
 	"github.com/metno/forti/xmlfrontend/pkg/xmlformat"
 )
diff --git a/xmlfrontend/internal/server/server.go b/xmlfrontend/internal/server/server.go
@@ -12,7 +12,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/metno/forti/internalprotocol"
+	"github.com/metno/forti/internal/internalprotocol"
 	"github.com/metno/forti/internal/radar"
 	"github.com/metno/forti/xmlfrontend/internal/server/config"
 	"github.com/metno/forti/xmlfrontend/internal/server/encode"

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/benchmarker/internal/location"`
`10`		`- "github.com/metno/forti/internalprotocol"`
	`10`	`+ "github.com/metno/forti/internal/internalprotocol"`
`11`	`11`	`"google.golang.org/grpc"`
`12`	`12`	`"google.golang.org/grpc/credentials/insecure"`
`13`	`13`	`)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"strings"`
`6`	`6`	`"time"`
`7`	`7`
`8`		`- "github.com/metno/forti/internalprotocol"`
	`8`	`+ "github.com/metno/forti/internal/internalprotocol"`
`9`	`9`	`"github.com/metno/go-weathersymbol"`
`10`	`10`	`)`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package health`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`
`6`		`- "github.com/metno/forti/internalprotocol"`
	`6`	`+ "github.com/metno/forti/internal/internalprotocol"`
`7`	`7`	`"google.golang.org/grpc/health/grpc_health_v1"`
`8`	`8`	`)`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`	`"github.com/metno/forti/correctedforecaster/internal/correction"`
`17`	`17`	`"github.com/metno/forti/correctedforecaster/internal/health"`
`18`	`18`	`"github.com/metno/forti/correctedforecaster/internal/lookup"`
`19`		`- "github.com/metno/forti/internalprotocol"`
	`19`	`+ "github.com/metno/forti/internal/internalprotocol"`
`20`	`20`	`"github.com/metno/forti/internal/radar"`
`21`	`21`	`)`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"testing"`
`5`	`5`	`"time"`
`6`	`6`
`7`		`- "github.com/metno/forti/internalprotocol"`
	`7`	`+ "github.com/metno/forti/internal/internalprotocol"`
`8`	`8`	`"github.com/metno/go-weathersymbol"`
`9`	`9`	`)`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"sync"`
`10`	`10`	`"time"`
`11`	`11`
`12`		`- "github.com/metno/forti/internalprotocol"`
	`12`	`+ "github.com/metno/forti/internal/internalprotocol"`
`13`	`13`	`"google.golang.org/grpc"`
`14`	`14`	`"google.golang.org/grpc/credentials/insecure"`
`15`	`15`	`)`