Merge pull request #248 from inovex/dependabot/github_actions/golangci/golangci-lint-action-8

chore(deps): bump golangci/golangci-lint-action from 6 to 8

Author: timonegk

.github/workflows/build.yaml

@@ -4,7 +4,7 @@ on: [ push ]
 
 env:
   GO_VERSION: '1.23'
-  GOLANGCI_VERSION: 'v1.60'
+  GOLANGCI_VERSION: 'v2.1.6'
   STATICCHECK_VERSION: '2024.1.1'
 
 permissions:
@@ -41,7 +41,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 1
-      - uses: golangci/golangci-lint-action@v6
+      - uses: golangci/golangci-lint-action@v8
         with:
           version: ${{ env.GOLANGCI_VERSION }}
 

internal/adapter/google/event.go

@@ -15,7 +15,7 @@ func calendarEventToEvent(e *calendar.Event, adapterSourceID string) models.Even
 	metadata := ensureMetadata(e, adapterSourceID)
 
 	var attendees []models.Attendee
-	var hasEventAccepted bool = true
+	var hasEventAccepted = true
 	for _, eventAttendee := range e.Attendees {
 		if eventAttendee.Self && eventAttendee.ResponseStatus == "declined" {
 			hasEventAccepted = false

internal/adapter/outlook_http/client.go

@@ -54,7 +54,10 @@ func (o *OutlookClient) ListEvents(ctx context.Context, start time.Time, end tim
 	}
 
 	body, _ := io.ReadAll(resp.Body)
-	resp.Body.Close()
+	err = resp.Body.Close()
+	if err != nil {
+		return nil, err
+	}
 
 	var eventList EventList
 	err = json.Unmarshal(body, &eventList)
@@ -70,7 +73,10 @@ func (o *OutlookClient) ListEvents(ctx context.Context, start time.Time, end tim
 		}
 
 		body, _ := io.ReadAll(resp.Body)
-		resp.Body.Close()
+		err = resp.Body.Close()
+		if err != nil {
+			return nil, err
+		}
 
 		var nextList EventList
 		err = json.Unmarshal(body, &nextList)
@@ -114,7 +120,12 @@ func (o *OutlookClient) CreateEvent(ctx context.Context, event models.Event) err
 	if err != nil {
 		return err
 	}
-	defer resp.Body.Close()
+	defer func() {
+		err = resp.Body.Close()
+		if err != nil {
+			log.Fatal(err)
+		}
+	}()
 
 	// TODO: we can maybe do this better
 	// the error messages are maybe standardized
@@ -149,7 +160,12 @@ func (o *OutlookClient) UpdateEvent(ctx context.Context, event models.Event) err
 	if err != nil {
 		return err
 	}
-	defer resp.Body.Close()
+	defer func() {
+		err = resp.Body.Close()
+		if err != nil {
+			log.Fatal(err)
+		}
+	}()
 
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
@@ -269,7 +285,7 @@ func (o OutlookClient) outlookEventToEvent(oe Event, adapterSourceID string) (e
 			},
 		})
 	}
-	var hasEventAccepted bool = true
+	var hasEventAccepted = true
 	if oe.ResponseStatus.Response == "declined" {
 		hasEventAccepted = false
 	}

internal/adapter/zep/client.go

@@ -181,18 +181,18 @@ func (zep *CalendarAPI) ListEvents(from, to time.Time) ([]Event, error) {
 
 // todo: read timezone from event, not just assume time.Local
 func eventFromCalDavEvent(event ical.Event, etag string) (Event, error) {
-	start, err := event.Component.Props.Get("dtstart").DateTime(time.Local)
+	start, err := event.Props.Get("dtstart").DateTime(time.Local)
 	if err != nil {
 		return Event{}, fmt.Errorf("unable to decode dtstart: %w", err)
 	}
 
-	end, err := event.Component.Props.Get("dtend").DateTime(time.Local)
+	end, err := event.Props.Get("dtend").DateTime(time.Local)
 	if err != nil {
 		return Event{}, fmt.Errorf("unable to decode dtend: %w", err)
 	}
 
 	return Event{
-		ID:          event.Component.Props.Get("uid").Value,
+		ID:          event.Props.Get("uid").Value,
 		Start:       start,
 		End:         end,
 		Summary:     safeGetComponentPropValueString(event, "summary"),
@@ -203,7 +203,7 @@ func eventFromCalDavEvent(event ical.Event, etag string) (Event, error) {
 }
 
 func safeGetComponentPropValueString(event ical.Event, key string) string {
-	prop := event.Component.Props.Get(key)
+	prop := event.Props.Get(key)
 	if prop == nil {
 		return ""
 	}

internal/auth/handler.go

@@ -62,7 +62,12 @@ func (l *OAuthHandler) Token() *oauth2.Token {
 
 func (l *OAuthHandler) createAuthorizationExchange(ctx context.Context) func(http.ResponseWriter, *http.Request) {
 	return func(w http.ResponseWriter, req *http.Request) {
-		defer l.listener.Close()
+		defer func() {
+			err := l.listener.Close()
+			if err != nil {
+				log.Fatal(err)
+			}
+		}()
 
 		authorizationCode := req.URL.Query().Get("code")
 		var err error

internal/auth/yaml_storage.go

@@ -25,7 +25,7 @@ type YamlStorage struct {
 func (y *YamlStorage) Setup(config config.AuthStorage, encryptionPassphrase string) error {
 	y.StorageEncryptionKey = encryptionPassphrase
 	y.StoragePath = config.Config["path"].(string)
-	if strings.HasPrefix(y.StoragePath, "~" + string(filepath.Separator)) {
+	if strings.HasPrefix(y.StoragePath, "~"+string(filepath.Separator)) {
 		homeDir, err := os.UserHomeDir()
 		if err != nil {
 			return err
@@ -126,14 +126,24 @@ func (y *YamlStorage) writeFile(cals []CalendarAuth) error {
 	if err != nil {
 		return fmt.Errorf("failed to open storage file: %w", err)
 	}
-	defer file.Close()
+	defer func() {
+		err = file.Close()
+		if err != nil {
+			log.Fatal(err)
+		}
+	}()
 
 	writer = file
 
 	// if encryption is enabled encrypt data
 	if y.StorageEncryptionKey != "" {
 		eFile := NewEncryptedFile(file, y.StorageEncryptionKey)
-		defer eFile.Close()
+		defer func() {
+			err = eFile.Close()
+			if err != nil {
+				log.Fatal(err)
+			}
+		}()
 		writer = eFile
 	}
 
@@ -150,7 +160,12 @@ func (y *YamlStorage) readAndParseFile() (*storageFile, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed to open storage path: %w", err)
 	}
-	defer file.Close()
+	defer func() {
+		err = file.Close()
+		if err != nil {
+			log.Fatal(err)
+		}
+	}()
 
 	var reader io.Reader
 	reader = file