Skip to content

Commit 77494fc

Browse files
authored
Merge pull request #2 from ystankevich/rename
Rename repository
2 parents 344206c + 84ab0e7 commit 77494fc

15 files changed

+112
-74
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ script:
1616
- make vendor
1717
- make install
1818
# NOTE: We will be able to run protoc commands from Travis once
19-
# protoc-gen-perm is added to the atlas gentool. For now, we can just run
19+
# protoc-gen-atlas-query-perm is added to the atlas gentool. For now, we can just run
2020
# tests to ensure that everything works as expected.
2121
- go test -v ./...

Gopkg.lock

Lines changed: 50 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
# go-tests = true
2525
# unused-packages = true
2626

27+
required = ["github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger"]
2728

2829
[[constraint]]
2930
name = "github.com/gogo/protobuf"

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ install:
1616

1717
.PHONY: perm-test
1818
perm-test: ./example/* ./test/*
19-
protoc -I. -I${SRCPATH} -I./vendor --perm_out="./" example/example.proto
19+
echo ${SRCPATH}
20+
protoc -I. -I${SRCPATH} -I./vendor -I./vendor/github.com/grpc-ecosystem/grpc-gateway --atlas-query-perm_out=. example/example.proto
2021
go test ./...
2122

2223
.PHONY: vendor

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
# protoc-gen-perm
1+
# protoc-gen-atlas-query-perm

example/example.pb.perm.go

Lines changed: 2 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/example.proto

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
syntax = "proto3";
33
package example;
44

5-
import "github.com/infobloxopen/protoc-gen-perm/options/collection_permissions.proto";
5+
import "github.com/infobloxopen/protoc-gen-atlas-query-perm/options/collection_permissions.proto";
66
import "github.com/infobloxopen/atlas-app-toolkit/query/collection_operators.proto";
77

88
message User {
9-
string first_name = 2 [(perm.permissions).filters.allow = "MATCH"];
10-
string middle_name = 3 [(perm.permissions).disable_sorting = true];
11-
string last_name = 4 [(perm.permissions) = {filters: {allow: "EQ"}, disable_sorting: false}];
12-
string age = 7 [(perm.permissions).filters.allow = "MATCH"];;
13-
int64 height = 15 [(perm.permissions).filters.allow = "GE"];
14-
float weight = 16 [(perm.permissions).filters.deny = "LE"];
15-
bool OnVacation = 17 [(perm.permissions).disable_sorting = true];
9+
string first_name = 2 [(atlas.query.permissions).filters.allow = "MATCH"];
10+
string middle_name = 3 [(atlas.query.permissions).disable_sorting = true];
11+
string last_name = 4 [(atlas.query.permissions) = {filters: {allow: "EQ"}, disable_sorting: false}];
12+
string age = 7 [(atlas.query.permissions).filters.allow = "MATCH"];;
13+
int64 height = 15 [(atlas.query.permissions).filters.allow = "GE"];
14+
float weight = 16 [(atlas.query.permissions).filters.deny = "LE"];
15+
bool OnVacation = 17 [(atlas.query.permissions).disable_sorting = true];
1616
}
1717

1818

main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package main
22

33
import (
44
"github.com/gogo/protobuf/vanity/command"
5-
"github.com/infobloxopen/protoc-gen-perm/plugin"
5+
"github.com/infobloxopen/protoc-gen-atlas-query-perm/plugin"
66
)
77

88
func main() {

options/collection_permissions.pb.go

Lines changed: 34 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

options/collection_permissions.proto

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
syntax = "proto2";
2-
package perm;
2+
package atlas.query;
33

4-
option go_package = "github.com/infobloxopen/protoc-gen-perm/options/;options";
4+
option go_package = "github.com/infobloxopen/protoc-gen-atlas-query-perm/options/;options";
55

66
import "google/protobuf/descriptor.proto";
77

0 commit comments

Comments
 (0)