chore: u

Author: jonas-jonas

.docker/Dockerfile-alpine

@@ -1,4 +1,4 @@
-FROM alpine:3.20
+FROM alpine:3.22
 
 RUN apk add -U --no-cache ca-certificates libssl3 libcrypto3 bash
 

.golangci.yml

@@ -1,7 +1,26 @@
+version: "2"
 linters:
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
   enable:
     - goimports
-
-linters-settings:
-  goimports:
-    local-prefixes: github.com/ory
+  settings:
+    goimports:
+      local-prefixes:
+        - github.com/ory
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -8,7 +8,7 @@ export GO111MODULE := on
 export PATH := .bin:${PATH}
 export PWD := $(shell pwd)
 
-GOLANGCI_LINT_VERSION = 1.61.0
+GOLANGCI_LINT_VERSION = 2.3.1
 
 GO_DEPENDENCIES = github.com/ory/go-acc \
 				  github.com/golang/mock/mockgen \

cmd/cloudx/testhelpers/testhelpers.go

@@ -26,7 +26,7 @@ import (
 	"github.com/ory/cli/cmd/cloudx/client"
 
 	"github.com/ory/x/cmdx"
-	. "github.com/ory/x/pointerx"
+	"github.com/ory/x/pointerx"
 	"github.com/ory/x/randx"
 )
 
@@ -234,8 +234,8 @@ func SetupPlaywright(t testing.TB) (playwright.Browser, playwright.Page, func())
 	pw, err := playwright.Run()
 	require.NoError(t, err)
 	browser, err := pw.Chromium.Launch(playwright.BrowserTypeLaunchOptions{
-		Headless:  Ptr(true),
-		TracesDir: Ptr(tracesDir),
+		Headless:  pointerx.Ptr(true),
+		TracesDir: pointerx.Ptr(tracesDir),
 	})
 	require.NoError(t, err)
 
@@ -250,7 +250,7 @@ func SetupPlaywright(t testing.TB) (playwright.Browser, playwright.Page, func())
 
 func NewPage(t testing.TB, browser playwright.Browser) playwright.Page {
 	page, err := browser.NewPage(playwright.BrowserNewPageOptions{
-		BaseURL: Ptr(client.CloudConsoleURL("").String()),
+		BaseURL: pointerx.Ptr(client.CloudConsoleURL("").String()),
 	})
 	require.NoError(t, err)
 
@@ -290,8 +290,8 @@ func PlaywrightAcceptConsentBrowserHook(t testing.TB, page playwright.Page, emai
 		t.Logf("open browser with %s", uri)
 
 		require.NoError(t, page.Context().Tracing().Start(playwright.TracingStartOptions{
-			Screenshots: Ptr(true),
-			Snapshots:   Ptr(true),
+			Screenshots: pointerx.Ptr(true),
+			Snapshots:   pointerx.Ptr(true),
 		}))
 		defer func() {
 			r := recover()

cmd/dev/ci/monorepo/changes.go

@@ -59,7 +59,7 @@ func getGitDefaults() string {
 func getChangedFiles(rootDirectory string, revisionRange string, gitOpts string) (string, error) {
 	changeLog, err := getRepositoryChangeLog(rootDirectory, revisionRange, gitOpts)
 	if err != nil {
-		return "", fmt.Errorf("Error getting changes from Git: %v", err)
+		return "", fmt.Errorf("error getting changes from Git: %v", err)
 	}
 	cleansedChangeLogArray := strings.Split(removeCommitMessages(changeLog), "\n")
 	cleanseRepositoryChanges(&cleansedChangeLogArray, true, true)
@@ -75,7 +75,7 @@ func getChangedFiles(rootDirectory string, revisionRange string, gitOpts string)
 func getChangedDirectories(rootDirectory string, revisionRange string, gitOpts string) (string, error) {
 	changeLog, err := getRepositoryChangeLog(rootDirectory, revisionRange, gitOpts)
 	if err != nil {
-		return "", fmt.Errorf("Error getting changes from Git: %v", err)
+		return "", fmt.Errorf("error getting changes from Git: %v", err)
 	}
 	cleansedChangeLogArray := strings.Split(removeCommitMessages(changeLog), "\n")
 	cleanseRepositoryChanges(&cleansedChangeLogArray, false, true)
@@ -90,7 +90,7 @@ func getChangedDirectories(rootDirectory string, revisionRange string, gitOpts s
 func getChangeLog(rootDirectory string, revisionRange string, gitOpts string) (string, error) {
 	repoChanges, err := getRepositoryChangeLog(rootDirectory, revisionRange, gitOpts)
 	if err != nil {
-		return "", fmt.Errorf("Error getting changes from Git: %v", err)
+		return "", fmt.Errorf("error getting changes from Git: %v", err)
 	}
 
 	return repoChanges, nil

cmd/dev/ci/monorepo/depgraph.go

@@ -49,7 +49,7 @@ func (graph *ComponentGraph) getComponentGraph(rootDirectory string) (*Component
 		return nil, err
 	}
 	if !isDirectory {
-		return nil, fmt.Errorf("Provided path '%s' is not a directory", rootDirectory)
+		return nil, fmt.Errorf("provided path '%s' is not a directory", rootDirectory)
 	}
 	if err := filepath.Walk(rootDirectory, func(path string, fi os.FileInfo, err error) error {
 		if err != nil {
@@ -92,20 +92,20 @@ func isDirectory(path string) (bool, error) {
 func (component *Component) getComponentFromConfig(configFilePath, rootDir string) (*Component, error) {
 	yamlFile, err := os.ReadFile(configFilePath)
 	if err != nil {
-		return nil, fmt.Errorf("Config file not found: '%s'", configFilePath)
+		return nil, fmt.Errorf("config file not found: '%s'", configFilePath)
 	}
 	err = yaml.Unmarshal(yamlFile, component)
 	if err != nil {
-		return nil, fmt.Errorf("Error reading config file '%s', invalid format: %v", configFilePath, err)
+		return nil, fmt.Errorf("error reading config file '%s', invalid format: %v", configFilePath, err)
 	}
 
 	configFilePath, err = filepath.Abs(configFilePath)
 	if err != nil {
-		return nil, fmt.Errorf("Error determining absolute config file path '%s': %v", configFilePath, err)
+		return nil, fmt.Errorf("error determining absolute config file path '%s': %v", configFilePath, err)
 	}
 	rootDir, err = filepath.Abs(rootDir)
 	if err != nil {
-		return nil, fmt.Errorf("Error determining absolute root directory path '%s': %v", rootDir, err)
+		return nil, fmt.Errorf("error determining absolute root directory path '%s': %v", rootDir, err)
 	}
 	rootDir = rootDir + "/"
 	component.Path = strings.TrimSuffix(strings.TrimPrefix(configFilePath, rootDir), "/"+configFile)
@@ -146,7 +146,7 @@ func (graph *ComponentGraph) resolveGraph() (ComponentGraph, error) {
 				g.addComponent(graph.componentIDs[id])
 			}
 
-			return g, errors.New("Circular dependency found")
+			return g, errors.New("circular dependency found")
 		}
 
 		// remove ready components (without dependencies) from the

cmd/dev/headers/copyright.go

@@ -113,11 +113,12 @@ Does not add the header to files listed in .gitignore and .prettierignore.`,
 	RunE: func(cmd *cobra.Command, args []string) error {
 		year, _, _ := time.Now().Date()
 		var template string
-		if headerType == headerTypeProprietary {
+		switch headerType {
+		case headerTypeProprietary:
 			template = HEADER_TEMPLATE_PROPRIETARY
-		} else if headerType == headerTypeOpenSource {
+		case headerTypeOpenSource:
 			template = HEADER_TEMPLATE_OPEN_SOURCE
-		} else {
+		default:
 			return fmt.Errorf("unknown value for type, expected one of %q or %q", headerTypeOpenSource, headerTypeProprietary)
 		}
 		return AddHeaders(".", fmt.Sprintf(template, year), exclude, regexp.MustCompile(HEADER_REGEXP))