Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 7.3.3 #42

Closed
wants to merge 1 commit into from
Closed

Release 7.3.3 #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[![CI](https://github.com/aoscloud/aos_message_proxy/workflows/CI/badge.svg)](https://github.com/aoscloud/aos_message_proxy/actions?query=workflow%3ACI)
[![codecov](https://codecov.io/gh/aoscloud/aos_message_proxy/branch/main/graph/badge.svg?token=mZKEdNf2fx)](https://codecov.io/gh/aoscloud/aos_message_proxy)
[![CI](https://github.com/aosedge/aos_message_proxy/workflows/CI/badge.svg)](https://github.com/aosedge/aos_message_proxy/actions?query=workflow%3ACI)
[![codecov](https://codecov.io/gh/aosedge/aos_message_proxy/branch/main/graph/badge.svg?token=mZKEdNf2fx)](https://codecov.io/gh/aosedge/aos_message_proxy)

# aos_message_proxy

Expand Down
10 changes: 5 additions & 5 deletions cmclient/cmclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
"sync"
"time"

"github.com/aoscloud/aos_common/aoserrors"
pb "github.com/aoscloud/aos_common/api/servicemanager/v3"
"github.com/aoscloud/aos_common/utils/cryptutils"
"github.com/aosedge/aos_common/aoserrors"
pb "github.com/aosedge/aos_common/api/servicemanager/v3"
"github.com/aosedge/aos_common/utils/cryptutils"
log "github.com/sirupsen/logrus"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
Expand All @@ -34,8 +34,8 @@ import (
"google.golang.org/grpc/status"
"google.golang.org/protobuf/proto"

"github.com/aoscloud/aos_messageproxy/config"
"github.com/aoscloud/aos_messageproxy/iamclient"
"github.com/aosedge/aos_messageproxy/config"
"github.com/aosedge/aos_messageproxy/iamclient"
)

/***********************************************************************************************************************
Expand Down
8 changes: 4 additions & 4 deletions cmclient/cmclient_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ import (
"testing"
"time"

"github.com/aoscloud/aos_common/aoserrors"
pb "github.com/aoscloud/aos_common/api/servicemanager/v3"
"github.com/aosedge/aos_common/aoserrors"
pb "github.com/aosedge/aos_common/api/servicemanager/v3"
log "github.com/sirupsen/logrus"
"google.golang.org/grpc"
"google.golang.org/protobuf/proto"

"github.com/aoscloud/aos_messageproxy/cmclient"
"github.com/aoscloud/aos_messageproxy/config"
"github.com/aosedge/aos_messageproxy/cmclient"
"github.com/aosedge/aos_messageproxy/config"
)

/***********************************************************************************************************************
Expand Down
4 changes: 2 additions & 2 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"path"
"time"

"github.com/aoscloud/aos_common/aoserrors"
"github.com/aoscloud/aos_common/aostypes"
"github.com/aosedge/aos_common/aoserrors"
"github.com/aosedge/aos_common/aostypes"
)

/***********************************************************************************************************************
Expand Down
6 changes: 3 additions & 3 deletions config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import (
"testing"
"time"

"github.com/aoscloud/aos_common/aoserrors"
"github.com/aoscloud/aos_common/aostypes"
"github.com/aosedge/aos_common/aoserrors"
"github.com/aosedge/aos_common/aostypes"

"github.com/aoscloud/aos_messageproxy/config"
"github.com/aosedge/aos_messageproxy/config"
)

/***********************************************************************************************************************
Expand Down
8 changes: 4 additions & 4 deletions downloader/downloader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ import (
"os"
"time"

"github.com/aoscloud/aos_common/aoserrors"
"github.com/aoscloud/aos_common/utils/action"
"github.com/aoscloud/aos_common/utils/retryhelper"
"github.com/aosedge/aos_common/aoserrors"
"github.com/aosedge/aos_common/utils/action"
"github.com/aosedge/aos_common/utils/retryhelper"
"github.com/cavaliergopher/grab/v3"
log "github.com/sirupsen/logrus"

"github.com/aoscloud/aos_messageproxy/config"
"github.com/aosedge/aos_messageproxy/config"
)

/***********************************************************************************************************************
Expand Down
6 changes: 3 additions & 3 deletions downloader/downloader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ import (
"testing"
"time"

"github.com/aoscloud/aos_common/aoserrors"
"github.com/aosedge/aos_common/aoserrors"
log "github.com/sirupsen/logrus"

"github.com/aoscloud/aos_messageproxy/config"
"github.com/aoscloud/aos_messageproxy/downloader"
"github.com/aosedge/aos_messageproxy/config"
"github.com/aosedge/aos_messageproxy/downloader"
)

/***********************************************************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion filechunker/filechunker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"os"
"path/filepath"

"github.com/aoscloud/aos_common/aoserrors"
"github.com/aosedge/aos_common/aoserrors"
)

/***********************************************************************************************************************
Expand Down
8 changes: 4 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
module github.com/aoscloud/aos_messageproxy
module github.com/aosedge/aos_messageproxy

go 1.21

replace github.com/ThalesIgnite/crypto11 => github.com/aoscloud/crypto11 v1.0.3-0.20220217163524-ddd0ace39e6f
replace github.com/ThalesIgnite/crypto11 => github.com/aosedge/crypto11 v1.0.3-0.20220217163524-ddd0ace39e6f

replace github.com/anexia-it/fsquota => github.com/aoscloud/fsquota v0.0.0-20231127111317-842d831105a7
replace github.com/anexia-it/fsquota => github.com/aosedge/fsquota v0.0.0-20231127111317-842d831105a7

require (
github.com/aoscloud/aos_common v0.0.0-20240521092209-a7ee24167d4b
github.com/aosedge/aos_common v0.0.0-20240701123742-84e62a5773fc
github.com/cavaliergopher/grab/v3 v3.0.1
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
github.com/golang/protobuf v1.5.3
Expand Down
12 changes: 6 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
github.com/aoscloud/aos_common v0.0.0-20240521092209-a7ee24167d4b h1:Hmoav/+PqbUKydLeYHrM3zWjjBRfxqUq8AS+CvJWzHY=
github.com/aoscloud/aos_common v0.0.0-20240521092209-a7ee24167d4b/go.mod h1:yhyw6Pt99GowDShfWnM+UMWR0+Z6rNApwJB39LL7f5E=
github.com/aoscloud/crypto11 v1.0.3-0.20220217163524-ddd0ace39e6f h1:1CPr+UrVduUABuDLGzsKaz7Dp8Nu6zSfp8WqR5TiH0I=
github.com/aoscloud/crypto11 v1.0.3-0.20220217163524-ddd0ace39e6f/go.mod h1:ILDKtnCKiQ7zRoNxcp36Y1ZR8LBPmR2E23+wTQe/MlE=
github.com/aoscloud/fsquota v0.0.0-20231127111317-842d831105a7 h1:IZrcOMTQKPENNXu3JIKu72Mr8KsRiiZaKN1nJqI2PgU=
github.com/aoscloud/fsquota v0.0.0-20231127111317-842d831105a7/go.mod h1:sqXhKgR89hKgqFrhR2nYyAz9lKahhLdTz4I+9GLTi6g=
github.com/aosedge/aos_common v0.0.0-20240701123742-84e62a5773fc h1:+g8nW2vQMq4iS307OKzLtd8u5ZQ9WcvpJNmpfZhtxG4=
github.com/aosedge/aos_common v0.0.0-20240701123742-84e62a5773fc/go.mod h1:fVk+1Za6Vaef1ysZvjJeFaA8NUS/8U4tJuCqLd5fky0=
github.com/aosedge/crypto11 v1.0.3-0.20220217163524-ddd0ace39e6f h1:xL5hA9axQFHnoVVF/Q8CkKl9JiTvA7U72jRDltMBB9M=
github.com/aosedge/crypto11 v1.0.3-0.20220217163524-ddd0ace39e6f/go.mod h1:ILDKtnCKiQ7zRoNxcp36Y1ZR8LBPmR2E23+wTQe/MlE=
github.com/aosedge/fsquota v0.0.0-20231127111317-842d831105a7 h1:KR+SuYXJ9HigUaJdUwRlkDOOpkCrliFF3liBVKu2GKY=
github.com/aosedge/fsquota v0.0.0-20231127111317-842d831105a7/go.mod h1:sqXhKgR89hKgqFrhR2nYyAz9lKahhLdTz4I+9GLTi6g=
github.com/cavaliergopher/grab/v3 v3.0.1 h1:4z7TkBfmPjmLAAmkkAZNX/6QJ1nNFdv3SdIHXju0Fr4=
github.com/cavaliergopher/grab/v3 v3.0.1/go.mod h1:1U/KNnD+Ft6JJiYoYBAimKH2XrYptb8Kl3DFGmsjpq4=
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU=
Expand Down
8 changes: 4 additions & 4 deletions iamclient/iamclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ import (
"sync"
"time"

"github.com/aoscloud/aos_common/aoserrors"
pb "github.com/aoscloud/aos_common/api/iamanager/v4"
"github.com/aoscloud/aos_common/utils/cryptutils"
"github.com/aosedge/aos_common/aoserrors"
pb "github.com/aosedge/aos_common/api/iamanager/v4"
"github.com/aosedge/aos_common/utils/cryptutils"
log "github.com/sirupsen/logrus"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/credentials/insecure"

"github.com/aoscloud/aos_messageproxy/config"
"github.com/aosedge/aos_messageproxy/config"
)

/***********************************************************************************************************************
Expand Down
8 changes: 4 additions & 4 deletions iamclient/iamclient_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ import (
"os"
"testing"

"github.com/aoscloud/aos_messageproxy/config"
"github.com/aoscloud/aos_messageproxy/iamclient"
"github.com/aosedge/aos_messageproxy/config"
"github.com/aosedge/aos_messageproxy/iamclient"

"github.com/aoscloud/aos_common/aoserrors"
pb "github.com/aoscloud/aos_common/api/iamanager/v4"
"github.com/aosedge/aos_common/aoserrors"
pb "github.com/aosedge/aos_common/api/iamanager/v4"
log "github.com/sirupsen/logrus"
"google.golang.org/grpc"
)
Expand Down
10 changes: 5 additions & 5 deletions iamserver/iamserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import (
"context"
"net"

"github.com/aoscloud/aos_common/aoserrors"
pb "github.com/aoscloud/aos_common/api/iamanager/v4"
"github.com/aoscloud/aos_common/utils/cryptutils"
"github.com/aoscloud/aos_messageproxy/config"
"github.com/aoscloud/aos_messageproxy/iamclient"
"github.com/aosedge/aos_common/aoserrors"
pb "github.com/aosedge/aos_common/api/iamanager/v4"
"github.com/aosedge/aos_common/utils/cryptutils"
"github.com/aosedge/aos_messageproxy/config"
"github.com/aosedge/aos_messageproxy/iamclient"
"github.com/golang/protobuf/ptypes/empty"
log "github.com/sirupsen/logrus"
"google.golang.org/grpc"
Expand Down
8 changes: 4 additions & 4 deletions iamserver/iamserver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (
"testing"
"time"

"github.com/aoscloud/aos_common/aoserrors"
pb "github.com/aoscloud/aos_common/api/iamanager/v4"
"github.com/aoscloud/aos_messageproxy/config"
"github.com/aoscloud/aos_messageproxy/iamserver"
"github.com/aosedge/aos_common/aoserrors"
pb "github.com/aosedge/aos_common/api/iamanager/v4"
"github.com/aosedge/aos_messageproxy/config"
"github.com/aosedge/aos_messageproxy/iamserver"
"github.com/golang/protobuf/ptypes/empty"
log "github.com/sirupsen/logrus"
"google.golang.org/grpc"
Expand Down
4 changes: 2 additions & 2 deletions imageunpacker/imageunpacker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ package imageunpacker
import (
"os"

"github.com/aoscloud/aos_common/aoserrors"
"github.com/aosedge/aos_common/aoserrors"

"github.com/aoscloud/aos_messageproxy/config"
"github.com/aosedge/aos_messageproxy/config"
)

/***********************************************************************************************************************
Expand Down
8 changes: 4 additions & 4 deletions imageunpacker/imageunpacker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ import (
"reflect"
"testing"

"github.com/aoscloud/aos_messageproxy/config"
"github.com/aoscloud/aos_messageproxy/imageunpacker"
"github.com/aosedge/aos_messageproxy/config"
"github.com/aosedge/aos_messageproxy/imageunpacker"

"github.com/aoscloud/aos_common/aoserrors"
"github.com/aoscloud/aos_common/utils/fs"
"github.com/aosedge/aos_common/aoserrors"
"github.com/aosedge/aos_common/utils/fs"
"github.com/opencontainers/go-digest"
imagespec "github.com/opencontainers/image-spec/specs-go/v1"
log "github.com/sirupsen/logrus"
Expand Down
6 changes: 3 additions & 3 deletions imageunpacker/serviceimage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import (
"sort"
"strings"

"github.com/aoscloud/aos_common/aoserrors"
"github.com/aoscloud/aos_common/aostypes"
"github.com/aoscloud/aos_common/image"
"github.com/aosedge/aos_common/aoserrors"
"github.com/aosedge/aos_common/aostypes"
"github.com/aosedge/aos_common/image"
"github.com/opencontainers/go-digest"
imagespec "github.com/opencontainers/image-spec/specs-go/v1"
log "github.com/sirupsen/logrus"
Expand Down
18 changes: 9 additions & 9 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@ import (
"os/signal"
"syscall"

"github.com/aoscloud/aos_common/aoserrors"
"github.com/aoscloud/aos_common/utils/cryptutils"
"github.com/aosedge/aos_common/aoserrors"
"github.com/aosedge/aos_common/utils/cryptutils"
"github.com/coreos/go-systemd/daemon"
"github.com/coreos/go-systemd/journal"
log "github.com/sirupsen/logrus"

"github.com/aoscloud/aos_messageproxy/cmclient"
"github.com/aoscloud/aos_messageproxy/config"
"github.com/aoscloud/aos_messageproxy/downloader"
"github.com/aoscloud/aos_messageproxy/iamclient"
"github.com/aoscloud/aos_messageproxy/iamserver"
"github.com/aoscloud/aos_messageproxy/imageunpacker"
"github.com/aoscloud/aos_messageproxy/vchanmanager"
"github.com/aosedge/aos_messageproxy/cmclient"
"github.com/aosedge/aos_messageproxy/config"
"github.com/aosedge/aos_messageproxy/downloader"
"github.com/aosedge/aos_messageproxy/iamclient"
"github.com/aosedge/aos_messageproxy/iamserver"
"github.com/aosedge/aos_messageproxy/imageunpacker"
"github.com/aosedge/aos_messageproxy/vchanmanager"
)

/***********************************************************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion vchanmanager/vchan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (

log "github.com/sirupsen/logrus"

"github.com/aoscloud/aos_common/aoserrors"
"github.com/aosedge/aos_common/aoserrors"
)

/*
Expand Down
10 changes: 5 additions & 5 deletions vchanmanager/vchanmanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ import (
"reflect"
"time"

"github.com/aoscloud/aos_common/aoserrors"
pbIAM "github.com/aoscloud/aos_common/api/iamanager/v4"
pbSM "github.com/aoscloud/aos_common/api/servicemanager/v3"
"github.com/aoscloud/aos_common/utils/syncstream"
"github.com/aosedge/aos_common/aoserrors"
pbIAM "github.com/aosedge/aos_common/api/iamanager/v4"
pbSM "github.com/aosedge/aos_common/api/servicemanager/v3"
"github.com/aosedge/aos_common/utils/syncstream"
"github.com/golang/protobuf/ptypes/empty"
log "github.com/sirupsen/logrus"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/timestamppb"

"github.com/aoscloud/aos_messageproxy/filechunker"
"github.com/aosedge/aos_messageproxy/filechunker"
)

/***********************************************************************************************************************
Expand Down
8 changes: 4 additions & 4 deletions vchanmanager/vchanmanager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ import (
"testing"
"time"

"github.com/aoscloud/aos_common/aoserrors"
pbIAM "github.com/aoscloud/aos_common/api/iamanager/v4"
pb "github.com/aoscloud/aos_common/api/servicemanager/v3"
"github.com/aoscloud/aos_messageproxy/vchanmanager"
"github.com/aosedge/aos_common/aoserrors"
pbIAM "github.com/aosedge/aos_common/api/iamanager/v4"
pb "github.com/aosedge/aos_common/api/servicemanager/v3"
"github.com/aosedge/aos_messageproxy/vchanmanager"
"github.com/golang/protobuf/ptypes/empty"
log "github.com/sirupsen/logrus"
"google.golang.org/protobuf/proto"
Expand Down
0 ...or/github.com/aoscloud/aos_common/LICENSE → vendor/github.com/aosedge/aos_common/LICENSE
View file
Open in desktop
File renamed without changes.
0 ...oscloud/aos_common/aoserrors/aoserrors.go → ...aosedge/aos_common/aoserrors/aoserrors.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../aoscloud/aos_common/aostypes/aostypes.go → ...m/aosedge/aos_common/aostypes/aostypes.go
View file
Open in desktop

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

0 ...s_common/api/iamanager/v4/iamanager.pb.go → ...s_common/api/iamanager/v4/iamanager.pb.go
View file
Open in desktop
File renamed without changes.
0 ...mon/api/iamanager/v4/iamanager_grpc.pb.go → ...mon/api/iamanager/v4/iamanager_grpc.pb.go
View file
Open in desktop
File renamed without changes.
0 ...pi/servicemanager/v3/servicemanager.pb.go → ...pi/servicemanager/v3/servicemanager.pb.go
View file
Open in desktop
File renamed without changes.
0 ...rvicemanager/v3/servicemanager_grpc.pb.go → ...rvicemanager/v3/servicemanager_grpc.pb.go
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...ub.com/aoscloud/aos_common/image/image.go → ...hub.com/aosedge/aos_common/image/image.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion ....com/aoscloud/aos_common/tpmkey/ecckey.go → ...b.com/aosedge/aos_common/tpmkey/ecckey.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion ....com/aoscloud/aos_common/tpmkey/rsakey.go → ...b.com/aosedge/aos_common/tpmkey/rsakey.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion ....com/aoscloud/aos_common/tpmkey/tpmkey.go → ...b.com/aosedge/aos_common/tpmkey/tpmkey.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion ...oscloud/aos_common/utils/action/action.go → ...aosedge/aos_common/utils/action/action.go
View file
Open in desktop

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

0 ...mmon/utils/contextreader/contextreader.go → ...mmon/utils/contextreader/contextreader.go
View file
Open in desktop
File renamed without changes.
Loading
Loading