Skip to content

Commit

Permalink
Move api/ to proto/
Browse files Browse the repository at this point in the history 
- All test variations pass.
  • Loading branch information
@bconway
bconway committed Dec 13, 2023
1 parent 7a93833 commit 66e6a9c
Show file tree
Hide file tree
Showing 25 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion internal/hermes-api/service/identity.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ import (
"strings"
"time"

"github.com/ownmfa/hermes/api/go/message"
ikey "github.com/ownmfa/hermes/internal/hermes-api/key"
"github.com/ownmfa/hermes/internal/hermes-api/session"
"github.com/ownmfa/hermes/pkg/consterr"
"github.com/ownmfa/hermes/pkg/hlog"
"github.com/ownmfa/hermes/pkg/key"
"github.com/ownmfa/hermes/pkg/metric"
"github.com/ownmfa/hermes/pkg/oath"
"github.com/ownmfa/hermes/proto/go/message"
"github.com/ownmfa/proto/go/api"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
Expand Down
2 changes: 1 addition & 1 deletion internal/hermes-api/service/identity_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"time"

"github.com/google/uuid"
"github.com/ownmfa/hermes/api/go/message"
ikey "github.com/ownmfa/hermes/internal/hermes-api/key"
"github.com/ownmfa/hermes/internal/hermes-api/session"
"github.com/ownmfa/hermes/pkg/cache"
Expand All @@ -22,6 +21,7 @@ import (
"github.com/ownmfa/hermes/pkg/oath"
"github.com/ownmfa/hermes/pkg/queue"
"github.com/ownmfa/hermes/pkg/test/random"
"github.com/ownmfa/hermes/proto/go/message"
"github.com/ownmfa/proto/go/api"
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"
Expand Down
2 changes: 1 addition & 1 deletion internal/hermes-api/session/page_token.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"time"

"github.com/google/uuid"
"github.com/ownmfa/hermes/api/go/token"
"github.com/ownmfa/hermes/proto/go/token"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/timestamppb"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/hermes-api/session/page_token_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"time"

"github.com/google/uuid"
"github.com/ownmfa/hermes/api/go/token"
"github.com/ownmfa/hermes/pkg/test/random"
"github.com/ownmfa/hermes/proto/go/token"
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/timestamppb"
Expand Down
2 changes: 1 addition & 1 deletion internal/hermes-api/session/web_token.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"time"

"github.com/google/uuid"
"github.com/ownmfa/hermes/api/go/token"
"github.com/ownmfa/hermes/pkg/consterr"
"github.com/ownmfa/hermes/pkg/crypto"
"github.com/ownmfa/hermes/proto/go/token"
"github.com/ownmfa/proto/go/api"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/timestamppb"
Expand Down
2 changes: 1 addition & 1 deletion internal/hermes-api/session/web_token_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"time"

"github.com/google/uuid"
"github.com/ownmfa/hermes/api/go/token"
"github.com/ownmfa/hermes/pkg/crypto"
"github.com/ownmfa/hermes/pkg/test/random"
"github.com/ownmfa/hermes/proto/go/token"
"github.com/ownmfa/proto/go/api"
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/proto"
Expand Down
2 changes: 1 addition & 1 deletion internal/hermes-api/test/identity_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (
"time"

"github.com/google/uuid"
"github.com/ownmfa/hermes/api/go/message"
ikey "github.com/ownmfa/hermes/internal/hermes-api/key"
"github.com/ownmfa/hermes/pkg/key"
"github.com/ownmfa/hermes/pkg/oath"
"github.com/ownmfa/hermes/pkg/test/random"
"github.com/ownmfa/hermes/proto/go/message"
"github.com/ownmfa/proto/go/api"
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/proto"
Expand Down
2 changes: 1 addition & 1 deletion internal/hermes-notifier/notifier/notify.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
"time"

"github.com/google/uuid"
"github.com/ownmfa/hermes/api/go/message"
"github.com/ownmfa/hermes/internal/hermes-notifier/template"
"github.com/ownmfa/hermes/pkg/hlog"
"github.com/ownmfa/hermes/pkg/key"
"github.com/ownmfa/hermes/pkg/metric"
"github.com/ownmfa/hermes/pkg/queue"
"github.com/ownmfa/hermes/proto/go/message"
"github.com/ownmfa/proto/go/api"
"google.golang.org/protobuf/proto"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/hermes-notifier/notifier/notify_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ import (
"time"

"github.com/google/uuid"
"github.com/ownmfa/hermes/api/go/message"
"github.com/ownmfa/hermes/pkg/cache"
"github.com/ownmfa/hermes/pkg/consterr"
"github.com/ownmfa/hermes/pkg/key"
"github.com/ownmfa/hermes/pkg/notify"
"github.com/ownmfa/hermes/pkg/oath"
"github.com/ownmfa/hermes/pkg/queue"
"github.com/ownmfa/hermes/pkg/test/random"
"github.com/ownmfa/hermes/proto/go/message"
"github.com/ownmfa/proto/go/api"
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"
Expand Down
2 changes: 1 addition & 1 deletion internal/hermes-notifier/test/notifier_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"time"

"github.com/google/uuid"
"github.com/ownmfa/hermes/api/go/message"
"github.com/ownmfa/hermes/pkg/key"
"github.com/ownmfa/hermes/pkg/test/random"
"github.com/ownmfa/hermes/proto/go/message"
"github.com/ownmfa/proto/go/api"
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/proto"
Expand Down
2 changes: 1 addition & 1 deletion pkg/test/matcher/mock_protoer_test.go
View file

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

2 changes: 1 addition & 1 deletion pkg/test/matcher/proto_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package matcher
import (
"testing"

"github.com/ownmfa/hermes/api/go/token"
"github.com/ownmfa/hermes/proto/go/token"
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"
)
Expand Down
0 api/Makefile → proto/Makefile
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions api/README.md → proto/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# API (Internal)
# Proto (Internal)

This directory contains the
[Protobuf](https://developers.google.com/protocol-buffers/) internal definitions
Expand All @@ -10,7 +10,7 @@ based on the Google [API Design Guide](https://cloud.google.com/apis/design).
### Go

```
import "github.com/ownmfa/hermes/api/go/token"
import "github.com/ownmfa/hermes/proto/go/token"
```

## Building
Expand Down
0 api/docker-compose.yml → proto/docker-compose.yml
View file
File renamed without changes.
0 api/go/Dockerfile → proto/go/Dockerfile
View file
File renamed without changes.
0 api/go/Makefile → proto/go/Makefile
View file
File renamed without changes.
0 api/go/message/doc.go → proto/go/message/doc.go
View file
File renamed without changes.
10 changes: 5 additions & 5 deletions api/go/message/ownmfa_notifier_in.pb.go → proto/go/message/ownmfa_notifier_in.pb.go
View file

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

0 api/go/token/doc.go → proto/go/token/doc.go
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions api/go/token/ownmfa_page.pb.go → proto/go/token/ownmfa_page.pb.go
View file

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

8 changes: 4 additions & 4 deletions api/go/token/ownmfa_web.pb.go → proto/go/token/ownmfa_web.pb.go
View file

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

2 changes: 1 addition & 1 deletion ...protobuf/message/ownmfa_notifier_in.proto → ...protobuf/message/ownmfa_notifier_in.proto
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package ownmfa.int.message;

option go_package = "github.com/ownmfa/hermes/api/go/message";
option go_package = "github.com/ownmfa/hermes/proto/go/message";

// NotifierIn represents notification metadata as used in message queues.
message NotifierIn {
Expand Down
2 changes: 1 addition & 1 deletion api/protobuf/token/ownmfa_page.proto → proto/protobuf/token/ownmfa_page.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ownmfa.int.token;

import "google/protobuf/timestamp.proto";

option go_package = "github.com/ownmfa/hermes/api/go/token";
option go_package = "github.com/ownmfa/hermes/proto/go/token";

// Page represents a pagination token.
message Page {
Expand Down
2 changes: 1 addition & 1 deletion api/protobuf/token/ownmfa_web.proto → proto/protobuf/token/ownmfa_web.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package ownmfa.int.token;
import "api/ownmfa_role.proto";
import "google/protobuf/timestamp.proto";

option go_package = "github.com/ownmfa/hermes/api/go/token";
option go_package = "github.com/ownmfa/hermes/proto/go/token";

// Web represents a web or API key token.
message Web {
Expand Down

0 comments on commit 66e6a9c

Please sign in to comment.