diff --git a/.gitattributes b/.gitattributes index 7e1e759..a582511 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,4 @@ /**/*.pb.go -diff -merge /**/*.pb.go linguist-generated=true /**/*_easyjson.go -diff -merge -/**/*_easyjson.go linguist-generated=true \ No newline at end of file +/**/*_easyjson.go linguist-generated=true diff --git a/Makefile b/Makefile index 7efc56b..bf57a03 100755 --- a/Makefile +++ b/Makefile @@ -73,4 +73,4 @@ generate: make easyjson-install; \ fi find ./ -name "_easyjson.go" -exec rm -rf {} \; - $(EASYJSON_DIR)/easyjson ./pkg/chain/chain.go \ No newline at end of file + $(EASYJSON_DIR)/easyjson ./pkg/chain/chain.go diff --git a/docs/resource.md b/docs/resource.md index 4ae339f..0d49cbc 100644 --- a/docs/resource.md +++ b/docs/resource.md @@ -1,6 +1,6 @@ # Resource -From the point of the access policy engine, a resource is an object to which a request is being performed. +From the point of the access policy engine, a resource is an object to which a request is being performed. This can be an object in a container within a namespace, or all objects in a container, or all containers within the root namespace etc. @@ -17,4 +17,4 @@ wildcard (`native:object//cnrID/*`). Check out formats that are defined in the schema: [native formats](../schema/native/consts.go), [s3 formats](../schema/s3/consts.go). You should validate a resource name using [util](../schema/native/util/validation.go) before instantiating a request or -before putting it to either to local override storage or the policy contract storage. \ No newline at end of file +before putting it to either to local override storage or the policy contract storage. diff --git a/pkg/chain/testdata/test_status_json.json b/pkg/chain/testdata/test_status_json.json index 34bcc63..4e60f21 100644 --- a/pkg/chain/testdata/test_status_json.json +++ b/pkg/chain/testdata/test_status_json.json @@ -72,4 +72,4 @@ } ], "MatchType": "FirstMatch" -} \ No newline at end of file +}