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.

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

feat: Add rules for AIP-162 Commit request name behavior and resource reference #736

Merged
merged 3 commits into from
Feb 2, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
69 changes: 69 additions & 0 deletions docs/rules/0162/commit-request-name-behavior.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
---
rule:
aip: 162
name: [core, '0162', commit-request-name-behavior]
summary: |
Commit requests should annotate the `name` field with `google.api.field_behavior`.
permalink: /162/commit-request-name-behavior
redirect_from:
- /0162/commit-request-name-behavior
---

# Commit requests: Name field behavior

This rule enforces that all `Commit` requests have
`google.api.field_behavior` set to `REQUIRED` on their `string name` field, as
mandated in [AIP-162][].

## Details

This rule looks at any message matching `Commit*Request` and complains if the
`name` field does not have a `google.api.field_behavior` annotation with a
value of `REQUIRED`.

## Examples

**Incorrect** code for this rule:

```proto
// Incorrect.
message CommitBookRequest {
// The `google.api.field_behavior` annotation should also be included.
string name = 1 [
(google.api.resource_reference).type = "library.googleapis.com/Book"
];
}
```

**Correct** code for this rule:

```proto
// Correct.
message CommitBookRequest {
string name = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference).type = "library.googleapis.com/Book"
];
}
```

## Disabling

If you need to violate this rule, use a leading comment above the field.
Remember to also include an [aip.dev/not-precedent][] comment explaining why.

```proto
message CommitBookRequest {
// (-- api-linter: core::0162::commit-request-name-behavior=disabled
// aip.dev/not-precedent: We need to do this because reasons. --)
string name = 1 [
(google.api.resource_reference).type = "library.googleapis.com/Book"
];
}
```

If you need to violate this rule for an entire file, place the comment at the
top of the file.

[aip-162]: https://aip.dev/162
[aip.dev/not-precedent]: https://aip.dev/not-precedent
64 changes: 64 additions & 0 deletions docs/rules/0162/commit-request-name-reference.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
---
rule:
aip: 162
name: [core, '0162', commit-request-name-reference]
summary: |
Commit requests should annotate the `name` field with `google.api.resource_reference`.
permalink: /162/commit-request-name-reference
redirect_from:
- /0162/commit-request-name-reference
---

# Commit requests: Name resource reference

This rule enforces that all `Commit` requests have
`google.api.resource_reference` on their `string name` field, as mandated in
[AIP-162][].

## Details

This rule looks at the `name` field of any message matching `Commit*Request`
and complains if it does not have a `google.api.resource_reference` annotation.

## Examples

**Incorrect** code for this rule:

```proto
// Incorrect.
message CommitBookRequest {
// The `google.api.resource_reference` annotation should also be included.
string name = 1 [(google.api.field_behavior) = REQUIRED];
}
```

**Correct** code for this rule:

```proto
// Correct.
message CommitBookRequest {
string name = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference).type = "library.googleapis.com/Book"
];
}
```

## Disabling

If you need to violate this rule, use a leading comment above the field.
Remember to also include an [aip.dev/not-precedent][] comment explaining why.

```proto
message CommitBookRequest {
// (-- api-linter: core::0162::commit-request-name-reference=disabled
// aip.dev/not-precedent: We need to do this because reasons. --)
string name = 1 [(google.api.field_behavior) = REQUIRED];
}
```

If you need to violate this rule for an entire file, place the comment at the
top of the file.

[aip-162]: https://aip.dev/162
[aip.dev/not-precedent]: https://aip.dev/not-precedent
4 changes: 3 additions & 1 deletion rules/aip0162/aip0162.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ func AddRules(r lint.RuleRegistry) error {
commitHTTPBody,
commitHTTPMethod,
commitHTTPURISuffix,
commitRequestNameField,
commitRequestMessageName,
commitRequestNameBehavior,
commitRequestNameField,
commitRequestNameReference,
commitResponseMessageName,
tagRevisionHTTPBody,
tagRevisionHTTPMethod,
Expand Down
29 changes: 29 additions & 0 deletions rules/aip0162/commit_request_name_behavior.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// Copyright 2021 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package aip0162

import (
"github.com/googleapis/api-linter/lint"
"github.com/googleapis/api-linter/rules/internal/utils"
"github.com/jhump/protoreflect/desc"
)

var commitRequestNameBehavior = &lint.FieldRule{
Name: lint.NewRuleName(162, "commit-request-name-behavior"),
OnlyIf: func(f *desc.FieldDescriptor) bool {
return isCommitRequestMessage(f.GetOwner()) && f.GetName() == "name"
},
LintField: utils.LintRequiredField,
}
49 changes: 49 additions & 0 deletions rules/aip0162/commit_request_name_behavior_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
// Copyright 2021 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package aip0162

import (
"testing"

"github.com/googleapis/api-linter/rules/internal/testutils"
)

func TestCommitRequestNameBehavior(t *testing.T) {
for _, test := range []struct {
name string
RPC string
Field string
FieldOpts string
problems testutils.Problems
}{
{"Valid", "CommitBook", "name", " [(google.api.field_behavior) = REQUIRED]", nil},
{"Missing", "CommitBook", "name", "", testutils.Problems{{Message: "(google.api.field_behavior) = REQUIRED"}}},
{"IrrelevantMessage", "PurgeBooks", "name", "", nil},
{"IrrelevantField", "CommitBook", "something_else", "", nil},
} {
t.Run(test.name, func(t *testing.T) {
f := testutils.ParseProto3Tmpl(t, `
import "google/api/field_behavior.proto";
message {{.RPC}}Request {
string {{.Field}} = 1{{.FieldOpts}};
}
`, test)
field := f.GetMessageTypes()[0].GetFields()[0]
if diff := test.problems.SetDescriptor(field).Diff(commitRequestNameBehavior.Lint(f)); diff != "" {
t.Error(diff)
}
})
}
}
29 changes: 29 additions & 0 deletions rules/aip0162/commit_request_name_reference.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// Copyright 2021 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package aip0162

import (
"github.com/googleapis/api-linter/lint"
"github.com/googleapis/api-linter/rules/internal/utils"
"github.com/jhump/protoreflect/desc"
)

var commitRequestNameReference = &lint.FieldRule{
Name: lint.NewRuleName(162, "commit-request-name-reference"),
OnlyIf: func(f *desc.FieldDescriptor) bool {
return isCommitRequestMessage(f.GetOwner()) && f.GetName() == "name"
},
LintField: utils.LintFieldResourceReference,
}
49 changes: 49 additions & 0 deletions rules/aip0162/commit_request_name_reference_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
// Copyright 2021 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package aip0162

import (
"testing"

"github.com/googleapis/api-linter/rules/internal/testutils"
)

func TestCommitRequestNameReference(t *testing.T) {
for _, test := range []struct {
name string
RPC string
Field string
FieldOpts string
problems testutils.Problems
}{
{"Valid", "CommitBook", "name", ` [(google.api.resource_reference) = { type: "foo" }]`, nil},
{"Missing", "CommitBook", "name", "", testutils.Problems{{Message: "google.api.resource_reference"}}},
{"IrrelevantMessage", "PurgeBooks", "name", "", nil},
{"IrrelevantField", "CommitBook", "something_else", "", nil},
} {
t.Run(test.name, func(t *testing.T) {
f := testutils.ParseProto3Tmpl(t, `
import "google/api/resource.proto";
message {{.RPC}}Request {
repeated string {{.Field}} = 1{{.FieldOpts}};
}
`, test)
field := f.GetMessageTypes()[0].GetFields()[0]
if diff := test.problems.SetDescriptor(field).Diff(commitRequestNameReference.Lint(f)); diff != "" {
t.Errorf(diff)
}
})
}
}