Skip to content

Commit

Permalink
fix: migrate from gitlab to github
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander Huck committed May 16, 2023
1 parent dbb507d commit ca5f38c
Show file tree
Hide file tree
Showing 41 changed files with 65 additions and 97 deletions.
33 changes: 0 additions & 33 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,35 +1,2 @@
# Changelog

## 0.5.0

### Bug Fixes

- Refactor: Outlook Adapter Interface rename
[!60](https://gitlab.inovex.de/inovex-calendarsync/calendarsync/-/merge_requests/60)
@jbraun
- Fix: Use Pointers for the Metadata to make sure it is actually empty [!55](https://gitlab.inovex.de/inovex-calendarsync/calendarsync/-/merge_requests/55)
- Improvement: We now hash emails for better diffs, Emails won't get replaced by
random strings anymore [!50](https://gitlab.inovex.de/inovex-calendarsync/calendarsync/-/merge_requests/50)
- Christoph Petrausch contributed some internal io.Reader and writer chaining
modifications (:wave: :sad:) [!47](https://gitlab.inovex.de/inovex-calendarsync/calendarsync/-/merge_requests/47)
- We made the whole syncing / diffing process way more robust and are catching more
edge cases! :tada: [!50](https://gitlab.inovex.de/inovex-calendarsync/calendarsync/-/merge_requests/50)


### Features
- Transformers now have a predefined order, Users don't need to check for the order
[!57](https://gitlab.inovex.de/inovex-calendarsync/calendarsync/-/merge_requests/57)
- CalendarSync now has a `dry-run` option [!54](https://gitlab.inovex.de/inovex-calendarsync/calendarsync/-/merge_requests/54)
- CalendarSync now has a `clean` option [!51](https://gitlab.inovex.de/inovex-calendarsync/calendarsync/-/merge_requests/51)
- Authentication Credentials which we save on the disk are now encrypted using
[age](https://github.com/FiloSottile/age)
[!46](https://gitlab.inovex.de/inovex-calendarsync/calendarsync/-/merge_requests/46)
@cschaub
- We're now using Go Version 1.20 [!44](https://gitlab.inovex.de/inovex-calendarsync/calendarsync/-/merge_requests/44)
- The browser now opens automatically for Authentication, if a valid env is detected
[!49](https://gitlab.inovex.de/inovex-calendarsync/calendarsync/-/merge_requests/49)


### Documentation

- Documentation is now improved and ready for OSS Release [!59](https://gitlab.inovex.de/inovex-calendarsync/calendarsync/-/merge_requests/)
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ data to a third party.
# How to use

Download the newest
[release](https://gitlab.inovex.de/inovex-calendarsync/calendarsync/-/releases)
[release](https://github.com/inovex/CalendarSync/releases)
for your platform, create a modified `sync.yaml` file based on the content of
the `./example.sync.yaml` file. Finally, start the app using `./calendarsync
--config sync.yaml --storage-encryption-key <YourSecretPassword>` and follow
Expand Down
10 changes: 5 additions & 5 deletions cmd/calendarsync/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import (
"fmt"
"os"

"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/auth"
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/models"
"github.com/inovex/CalendarSync/internal/auth"
"github.com/inovex/CalendarSync/internal/models"

log "github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"

"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/adapter"
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/config"
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/sync"
"github.com/inovex/CalendarSync/internal/adapter"
"github.com/inovex/CalendarSync/internal/config"
"github.com/inovex/CalendarSync/internal/sync"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module gitlab.inovex.de/inovex-calendarsync/calendarsync
module github.com/inovex/CalendarSync

go 1.20

Expand Down
4 changes: 2 additions & 2 deletions internal/adapter/adapter.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"

log "github.com/sirupsen/logrus"
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/auth"
"github.com/inovex/CalendarSync/internal/auth"

"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/config"
"github.com/inovex/CalendarSync/internal/config"
)

type Type string
Expand Down
4 changes: 2 additions & 2 deletions internal/adapter/google/adapter.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"time"

"github.com/pkg/browser"
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/models"
"github.com/inovex/CalendarSync/internal/models"

"golang.org/x/oauth2/google"

log "github.com/sirupsen/logrus"
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/auth"
"github.com/inovex/CalendarSync/internal/auth"
"golang.org/x/oauth2"
"google.golang.org/api/calendar/v3"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/adapter/google/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"net/http"
"time"

"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/models"
"github.com/inovex/CalendarSync/internal/models"

log "github.com/sirupsen/logrus"
"go.uber.org/ratelimit"
Expand Down
2 changes: 1 addition & 1 deletion internal/adapter/google/event.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"errors"
"time"

"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/models"
"github.com/inovex/CalendarSync/internal/models"

"google.golang.org/api/calendar/v3"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/adapter/google/event_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/models"
"github.com/inovex/CalendarSync/internal/models"
"google.golang.org/api/calendar/v3"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/adapter/outlook_http/adapter.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
log "github.com/sirupsen/logrus"
"golang.org/x/oauth2"

"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/auth"
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/models"
"github.com/inovex/CalendarSync/internal/auth"
"github.com/inovex/CalendarSync/internal/models"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/adapter/outlook_http/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
log "github.com/sirupsen/logrus"
"github.com/thlib/go-timezone-local/tzlocal"

"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/models"
"github.com/inovex/CalendarSync/internal/models"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/adapter/outlook_http/models.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package outlook_http

import (
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/models"
"github.com/inovex/CalendarSync/internal/models"
)

// https://learn.microsoft.com/en-us/graph/api/resources/event?view=graph-rest-1.0
Expand Down
10 changes: 5 additions & 5 deletions internal/adapter/sink_adapter.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import (
"fmt"
"time"

"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/auth"
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/models"
"github.com/inovex/CalendarSync/internal/auth"
"github.com/inovex/CalendarSync/internal/models"

log "github.com/sirupsen/logrus"

"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/adapter/google"
outlook "gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/adapter/outlook_http"
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/sync"
"github.com/inovex/CalendarSync/internal/adapter/google"
outlook "github.com/inovex/CalendarSync/internal/adapter/outlook_http"
"github.com/inovex/CalendarSync/internal/sync"
)

type SinkAdapter struct {
Expand Down
12 changes: 6 additions & 6 deletions internal/adapter/source_adapter.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ import (
"fmt"
"time"

"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/auth"
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/models"
"github.com/inovex/CalendarSync/internal/auth"
"github.com/inovex/CalendarSync/internal/models"

outlook "gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/adapter/outlook_http"
outlook "github.com/inovex/CalendarSync/internal/adapter/outlook_http"

log "github.com/sirupsen/logrus"

"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/adapter/google"
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/adapter/zep"
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/sync"
"github.com/inovex/CalendarSync/internal/adapter/google"
"github.com/inovex/CalendarSync/internal/adapter/zep"
"github.com/inovex/CalendarSync/internal/sync"
)

// SourceClientFactory is a convenience factory. It is needed to retrieve new - default - client implementations.
Expand Down
2 changes: 1 addition & 1 deletion internal/adapter/zep/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"
"time"

"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/models"
"github.com/inovex/CalendarSync/internal/models"

"github.com/emersion/go-ical"
"github.com/emersion/go-webdav"
Expand Down
2 changes: 1 addition & 1 deletion internal/auth/storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/config"
"github.com/inovex/CalendarSync/internal/config"
)

type Storage interface {
Expand Down
2 changes: 1 addition & 1 deletion internal/auth/yaml_storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"io/fs"
"os"

"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/config"
"github.com/inovex/CalendarSync/internal/config"
"gopkg.in/yaml.v3"
)

Expand Down
6 changes: 3 additions & 3 deletions internal/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/config"
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/sync"
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/transformation"
"github.com/inovex/CalendarSync/internal/config"
"github.com/inovex/CalendarSync/internal/sync"
"github.com/inovex/CalendarSync/internal/transformation"
)

type ConfigTestSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/models/time.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"time"

"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/config"
"github.com/inovex/CalendarSync/internal/config"
)

// TODO: @ljarosch: This might just be a quick-fix. I'm not yet sure if this is an ideal solution
Expand Down
2 changes: 1 addition & 1 deletion internal/sync/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"time"

"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/models"
"github.com/inovex/CalendarSync/internal/models"

log "github.com/sirupsen/logrus"
)
Expand Down
6 changes: 3 additions & 3 deletions internal/sync/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ import (
"testing"
"time"

"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/config"
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/models"
"github.com/inovex/CalendarSync/internal/config"
"github.com/inovex/CalendarSync/internal/models"

log "github.com/sirupsen/logrus"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/suite"

"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/sync/mocks"
"github.com/inovex/CalendarSync/internal/sync/mocks"
)

type ControllerTestSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/sync/mocks/Sink.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/sync/mocks/Source.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/sync/synchronisation.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package sync

import (
"context"
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/models"
"github.com/inovex/CalendarSync/internal/models"
"time"
)

Expand Down
6 changes: 3 additions & 3 deletions internal/sync/transformer.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"reflect"
"strings"

"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/config"
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/models"
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/transformation"
"github.com/inovex/CalendarSync/internal/config"
"github.com/inovex/CalendarSync/internal/models"
"github.com/inovex/CalendarSync/internal/transformation"
)

// Transformer applies a well-defined transformation to an event. Multiple transformers may be concatenated.
Expand Down
2 changes: 1 addition & 1 deletion internal/transformation/keepAttendees.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"net/mail"

"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/models"
"github.com/inovex/CalendarSync/internal/models"
)

// KeepAttendes allows to keep the attendees of an event.
Expand Down
2 changes: 1 addition & 1 deletion internal/transformation/keepAttendees_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/models"
"github.com/inovex/CalendarSync/internal/models"
)

// verify keep attendees
Expand Down
7 changes: 4 additions & 3 deletions internal/transformation/keepDescription.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package transformation

import (
"strings"

"github.com/aquilax/truncate"
"github.com/microcosm-cc/bluemonday"
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/models"
"strings"
"github.com/inovex/CalendarSync/internal/models"
)

// KeepDescription allows to keep the description of an event.
Expand All @@ -15,7 +16,7 @@ func (t *KeepDescription) Name() string {
}

func (t *KeepDescription) Transform(source models.Event, sink models.Event) (models.Event, error) {
// need to remove microsoft html overhead. read more here: https://gitlab.inovex.de/inovex-calendarsync/calendarsync/-/merge_requests/37#note_569909
// need to remove microsoft html overhead
p := bluemonday.StrictPolicy()
description := strings.ReplaceAll(source.Description, "\r\n", "")
sanitizedDescription := p.Sanitize(description)
Expand Down
2 changes: 1 addition & 1 deletion internal/transformation/keepDescription_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package transformation

import (
"github.com/stretchr/testify/assert"
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/models"
"github.com/inovex/CalendarSync/internal/models"
"strings"
"testing"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/transformation/keepLocation.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package transformation

import (
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/models"
"github.com/inovex/CalendarSync/internal/models"
)

// KeepLocation allows to keep the location of an event.
Expand Down
2 changes: 1 addition & 1 deletion internal/transformation/keepLocation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package transformation

import (
"github.com/stretchr/testify/assert"
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/models"
"github.com/inovex/CalendarSync/internal/models"
"testing"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/transformation/keepMeetingLink.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package transformation

import (
"fmt"
"gitlab.inovex.de/inovex-calendarsync/calendarsync/internal/models"
"github.com/inovex/CalendarSync/internal/models"
)

// KeepMeetingLink allows to keep the meeting link of an event.
Expand Down
Loading

0 comments on commit ca5f38c

Please sign in to comment.