Merge pull request #62 from PDOK/fix-partioning

remove hard-coded index name from partition + add 'optimize' flag + bump deps

Author: rkettelerij

.github/workflows/lint-go.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.23'
+          go-version: '1.25'
           cache: false
 
       - uses: actions/checkout@v3
@@ -30,26 +30,6 @@ jobs:
           govulncheck ./...
 
       - name: Golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v8
         with:
-          # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: latest
-
-          # Optional: working directory, useful for monorepos
-          # working-directory: somedir
-
-          # Optional: golangci-lint command line arguments.
-          # args: --issues-exit-code=0
-
-          # Optional: show only new issues if it's a pull request. The default value is `false`.
-          # only-new-issues: true
-
-          # Optional: if set to true then the all caching functionality will be complete disabled,
-          #           takes precedence over all other caching options.
-          # skip-cache: true
-
-          # Optional: if set to true then the action don't cache or restore ~/go/pkg.
-          # skip-pkg-cache: true
-
-          # Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
-          # skip-build-cache: true
+          version: v2.5.0

.github/workflows/test-go.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.23'
+          go-version: '1.25'
 
       - name: Download
         run: go mod download all

.golangci.yaml

@@ -1,5 +1,5 @@
 ####### Go build
-FROM docker.io/golang:1.23-bookworm AS build-env
+FROM docker.io/golang:1.25-bookworm AS build-env
 WORKDIR /go/src/service
 ADD . /go/src/service
 

Dockerfile

@@ -44,6 +44,7 @@ const (
 	featureTableFidFlag      = "fid"
 	featureTableGeomFlag     = "geom"
 	pageSizeFlag             = "page-size"
+	skipOptimizeFlag         = "skip-optimize"
 	rewritesFileFlag         = "rewrites-file"
 	synonymsFileFlag         = "synonyms-file"
 	languageFlag             = "lang"
@@ -162,7 +163,7 @@ var (
 	}
 )
 
-//nolint:funlen
+//nolint:funlen,maintidx
 func main() {
 	app := cli.NewApp()
 	app.Name = appName
@@ -385,6 +386,13 @@ func main() {
 					Required: false,
 					Value:    10000,
 				},
+				&cli.BoolFlag{
+					Name:     skipOptimizeFlag,
+					EnvVars:  []string{strcase.ToScreamingSnake(skipOptimizeFlag)},
+					Usage:    "Skip running VACUUM ANALYZE on the search index after import",
+					Required: false,
+					Value:    false,
+				},
 			},
 			Action: func(c *cli.Context) error {
 				dbConn := flagsToDBConnStr(c)
@@ -403,7 +411,7 @@ func main() {
 					return fmt.Errorf("no configured collection found with id: %s", collectionID)
 				}
 				return etl.ImportFile(*collection, c.String(searchIndexFlag), c.Path(fileFlag), featureTable,
-					c.Int(pageSizeFlag), dbConn)
+					c.Int(pageSizeFlag), c.Bool(skipOptimizeFlag), dbConn)
 			},
 		},
 	}

cmd/main.go

@@ -89,7 +89,7 @@ func Test_newRouter(t *testing.T) {
 			log.Print(recorder.Body.String()) // to ease debugging
 			switch {
 			case strings.HasSuffix(tt.apiCall, "json"):
-				assert.JSONEq(t, recorder.Body.String(), string(expectedBody))
+				assert.JSONEq(t, string(expectedBody), recorder.Body.String())
 			case strings.HasSuffix(tt.apiCall, "html") || strings.HasSuffix(tt.apiCall, "xml"):
 				assert.Contains(t, normalize(recorder.Body.String()), normalize(string(expectedBody)))
 			default:

cmd/main_test.go

@@ -16,45 +16,6 @@ const (
 	CookieMaxAge = 60 * 60 * 24
 )
 
-// NewConfig read YAML config file, required to start Gomagpie
-func NewConfig(configFile string) (*Config, error) {
-	yamlData, err := os.ReadFile(configFile)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read config file %w", err)
-	}
-
-	// expand environment variables
-	yamlData = []byte(os.ExpandEnv(string(yamlData)))
-
-	var config *Config
-	err = yaml.Unmarshal(yamlData, &config)
-	if err != nil {
-		return nil, fmt.Errorf("failed to unmarshal config file, error: %w", err)
-	}
-	err = validateLocalPaths(config)
-	if err != nil {
-		return nil, fmt.Errorf("validation error in config file, error: %w", err)
-	}
-	return config, nil
-}
-
-// UnmarshalYAML hooks into unmarshalling to set defaults and validate config
-func (c *Config) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	type cfg Config
-	if err := unmarshal((*cfg)(c)); err != nil {
-		return err
-	}
-
-	// init config
-	if err := setDefaults(c); err != nil {
-		return err
-	}
-	if err := validate(c); err != nil {
-		return err
-	}
-	return nil
-}
-
 type Config struct {
 	// Version of the API. When releasing a new version which contains backwards-incompatible changes, a new major version must be released.
 	Version string `yaml:"version" json:"version" validate:"required,semver" default:"1.0.0"`
@@ -102,6 +63,45 @@ type Config struct {
 	Collections GeoSpatialCollections `yaml:"collections,omitempty" json:"collections,omitempty" validate:"required,dive"`
 }
 
+// NewConfig read YAML config file, required to start Gomagpie
+func NewConfig(configFile string) (*Config, error) {
+	yamlData, err := os.ReadFile(configFile)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read config file %w", err)
+	}
+
+	// expand environment variables
+	yamlData = []byte(os.ExpandEnv(string(yamlData)))
+
+	var config *Config
+	err = yaml.Unmarshal(yamlData, &config)
+	if err != nil {
+		return nil, fmt.Errorf("failed to unmarshal config file, error: %w", err)
+	}
+	err = validateLocalPaths(config)
+	if err != nil {
+		return nil, fmt.Errorf("validation error in config file, error: %w", err)
+	}
+	return config, nil
+}
+
+// UnmarshalYAML hooks into unmarshalling to set defaults and validate config
+func (c *Config) UnmarshalYAML(unmarshal func(any) error) error {
+	type cfg Config
+	if err := unmarshal((*cfg)(c)); err != nil {
+		return err
+	}
+
+	// init config
+	if err := setDefaults(c); err != nil {
+		return err
+	}
+	if err := validate(c); err != nil {
+		return err
+	}
+	return nil
+}
+
 type License struct {
 	// Name of the license, e.g. MIT, CC0, etc
 	Name string `yaml:"name" json:"name" validate:"required" default:"CC0"`

config/config.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func init() {
@@ -51,7 +52,7 @@ func TestNewConfig(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			_, err := NewConfig(tt.args.configFile)
 			if tt.wantErr {
-				assert.Error(t, err)
+				require.Error(t, err)
 				assert.ErrorContains(t, err, tt.wantErrMsg)
 			} else {
 				assert.NoError(t, err)
@@ -88,7 +89,7 @@ func TestGeoSpatialCollections_Ordering(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			config, err := NewConfig(tt.args.configFile)
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			var actual []string
 			if tt.args.expectedTitles {
 				actual = Map(config.AllCollections(), func(item GeoSpatialCollection) string { return *item.Metadata.Title })
@@ -148,7 +149,7 @@ func TestGeoSpatialCollections_ContainsID(t *testing.T) {
 }
 
 type TestEmbeddedGeoSpatialCollection struct {
-	C GeoSpatialCollection `json:"C"`
+	C GeoSpatialCollection `json:"C"` //nolint:tagliatelle
 }
 
 func TestGeoSpatialCollection_Unmarshalling_JSON(t *testing.T) {
@@ -184,7 +185,7 @@ func TestGeoSpatialCollection_Unmarshalling_JSON(t *testing.T) {
 			if !tt.wantErr(t, err, errors.New("json.Unmarshal")) {
 				return
 			}
-			assert.EqualValuesf(t, &TestEmbeddedGeoSpatialCollection{C: *tt.want}, unmarshalledEmbedded, "json.Unmarshal")
+			assert.Equalf(t, &TestEmbeddedGeoSpatialCollection{C: *tt.want}, unmarshalledEmbedded, "json.Unmarshal")
 		})
 	}
 }

config/config_test.go

@@ -15,7 +15,7 @@ type Language struct {
 // MarshalJSON turn language tag into JSON
 // Value instead of pointer receiver because only that way it can be used for both.
 func (l Language) MarshalJSON() ([]byte, error) {
-	return json.Marshal(l.Tag.String())
+	return json.Marshal(l.String())
 }
 
 // UnmarshalJSON turn JSON into Language

config/language.go

@@ -11,7 +11,7 @@ import (
 )
 
 type TestEmbeddedLanguage struct {
-	L Language `json:"L" yaml:"L"`
+	L Language `json:"L" yaml:"L"` //nolint:tagliatelle
 }
 
 func TestLanguage_DeepCopy(t *testing.T) {
@@ -82,7 +82,7 @@ func TestLanguage_Marshalling_JSON(t *testing.T) {
 			if !tt.wantErr(t, err, errors.New("yaml.Unmarshal")) {
 				return
 			}
-			assert.EqualValuesf(t, &TestEmbeddedLanguage{L: *tt.lang}, unmarshalledEmbedded, "yaml.Unmarshal")
+			assert.Equalf(t, &TestEmbeddedLanguage{L: *tt.lang}, unmarshalledEmbedded, "yaml.Unmarshal")
 		})
 	}
 }