Skip to content

Cloudrun domain DSF #7764

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

Merged
modular-magician merged 1 commit into from
Nov 10, 2020
Merged

Cloudrun domain DSF #7764

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/4209.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
cloudrun: added diff suppress function for `google_cloud_run_domain_mapping` `metadata.annotations` to ignore API-set fields
```
9 changes: 5 additions & 4 deletions google/resource_cloud_run_domain_mapping.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,11 @@ func resourceCloudRunDomainMapping() *schema.Resource {
project ID or project number.`,
},
"annotations": {
Type: schema.TypeMap,
Computed: true,
Optional: true,
ForceNew: true,
Type: schema.TypeMap,
Computed: true,
Optional: true,
ForceNew: true,
DiffSuppressFunc: cloudrunAnnotationDiffSuppress,
Description: `Annotations is a key value map stored with a resource that
may be set by external tools to store and retrieve arbitrary metadata. More
info: http://kubernetes.io/docs/user-guide/annotations`,
Expand Down
3 changes: 3 additions & 0 deletions google/resource_cloud_run_domain_mapping_generated_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ resource "google_cloud_run_domain_mapping" "default" {

metadata {
namespace = "%{namespace}"
annotations = {
"run.googleapis.com/launch-stage" = "BETA"
}
}

spec {
Expand Down
3 changes: 3 additions & 0 deletions website/docs/r/cloud_run_domain_mapping.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ resource "google_cloud_run_domain_mapping" "default" {

metadata {
namespace = "my-project-name"
annotations = {
"run.googleapis.com/launch-stage" = "BETA"
}
}

spec {
Expand Down