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

Jump to bottom

Use diff suppress func for binary authorization attestor #11731

Merged
merged 1 commit into from
May 19, 2022
Merged

Use diff suppress func for binary authorization attestor #11731

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
3 changes: 3 additions & 0 deletions .changelog/5967.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
binaryauthorization: fixed permadiff in `google_binary_authorization_attestor`
```
5 changes: 3 additions & 2 deletions google/resource_binary_authorization_attestor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,9 @@ encoding of the public key.`,
'https://tools.ietf.org/html/rfc7468#section-13'`,
},
"signature_algorithm": {
Type: schema.TypeString,
Optional: true,
Type: schema.TypeString,
Optional: true,
DiffSuppressFunc: compareSignatureAlgorithm,
Description: `The signature algorithm used to verify a message against
a signature using this key. These signature algorithm must
match the structure and any object identifiers encoded in
Expand Down
0 ...urce_binaryauthorization_attestor_test.go → ...rce_binary_authorization_attestor_test.go
View file
Open in desktop
File renamed without changes.
0 ...source_binaryauthorization_policy_test.go → ...ource_binary_authorization_policy_test.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions google/resource_clouddeploy_target_generated_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,9 @@ resource "google_clouddeploy_target" "primary" {
name = "tf-test-target%{random_suffix}"

annotations = {
my_third_annotation = "example-annotation-3"

my_second_annotation = "updated-example-annotation-2"

my_third_annotation = "example-annotation-3"
}

description = "updated description"
Expand Down
8 changes: 4 additions & 4 deletions website/docs/r/clouddeploy_delivery_pipeline.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@ resource "google_clouddeploy_delivery_pipeline" "primary" {
name = "pipeline"

annotations = {
my_second_annotation = "example-annotation-2"

my_first_annotation = "example-annotation-1"

my_second_annotation = "example-annotation-2"
}

description = "basic description"

labels = {
my_first_label = "example-label-1"

my_second_label = "example-label-2"

my_first_label = "example-label-1"
}

project = "my-project-name"
Expand Down